diff options
Diffstat (limited to 'arch/arm/boards/webasto-ccbv2/board.c')
| -rw-r--r-- | arch/arm/boards/webasto-ccbv2/board.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/boards/webasto-ccbv2/board.c b/arch/arm/boards/webasto-ccbv2/board.c index 477771309e..6b2c8b8cb0 100644 --- a/arch/arm/boards/webasto-ccbv2/board.c +++ b/arch/arm/boards/webasto-ccbv2/board.c @@ -5,14 +5,14 @@ #include <common.h> #include <init.h> -#include <mach/generic.h> -#include <mach/bbu.h> +#include <mach/imx/generic.h> +#include <mach/imx/bbu.h> #include <of.h> #include <string.h> #include "ccbv2.h" -static int ccbv2_probe(struct device_d *dev) +static int ccbv2_probe(struct device *dev) { struct device_node *overlay; struct fdt_header *fdt; @@ -22,7 +22,10 @@ static int ccbv2_probe(struct device_d *dev) imx6_bbu_internal_mmcboot_register_handler("emmc", "/dev/mmc1", BBU_HANDLER_FLAG_DEFAULT); - barebox_set_hostname("weabsto-ccbv2"); + if (of_machine_is_compatible("webasto,imx6ul-marvel")) + barebox_set_hostname("webasto-marvel"); + else + barebox_set_hostname("webasto-ccbv2"); if(!IS_ENABLED(CONFIG_FIRMWARE_CCBV2_OPTEE)) return 0; @@ -48,10 +51,12 @@ err: static const struct of_device_id ccbv2_of_match[] = { { .compatible = "webasto,imx6ul-ccbv2" }, + { .compatible = "webasto,imx6ul-marvel" }, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE(of, ccbv2_of_match); -static struct driver_d ccbv2_board_driver = { +static struct driver ccbv2_board_driver = { .name = "board-imx6ul-ccbv2", .probe = ccbv2_probe, .of_compatible = ccbv2_of_match, |