diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
| commit | 8c02f14d1db16068a005b9674da42f14f344ab89 (patch) | |
| tree | b57b9d55789ab59e63436ff70f569db06c228f50 /arch/arm | |
| parent | 52ef5245746cb13d1eaf9d520d9e7a36d2a70d4b (diff) | |
| parent | 544bd2f460da25de41094aceadb799ca31474d97 (diff) | |
| download | barebox-8c02f14d1db16068a005b9674da42f14f344ab89.tar.gz barebox-8c02f14d1db16068a005b9674da42f14f344ab89.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/vscom-baltos/lowlevel.c | 6 | ||||
| -rw-r--r-- | arch/arm/configs/imx23_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/imx28_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/kindle-mx50_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/zii_vf610_dev_defconfig | 1 |
7 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/boards/vscom-baltos/lowlevel.c b/arch/arm/boards/vscom-baltos/lowlevel.c index 98bbbaae16..0a220f2628 100644 --- a/arch/arm/boards/vscom-baltos/lowlevel.c +++ b/arch/arm/boards/vscom-baltos/lowlevel.c @@ -66,7 +66,7 @@ static const struct am33xx_emif_regs ddr3_regs_256mb = { }; -extern char __dtb_am335x_baltos_minimal_start[]; +extern char __dtb_z_am335x_baltos_minimal_start[]; /** * @brief The basic entry point for board initialization. @@ -82,7 +82,7 @@ static noinline void baltos_sram_init(void) uint32_t sdram_size; void *fdt; - fdt = __dtb_am335x_baltos_minimal_start; + fdt = __dtb_z_am335x_baltos_minimal_start; /* WDT1 is already running when the bootloader gets control * Disable it to avoid "random" resets @@ -132,7 +132,7 @@ ENTRY_FUNCTION(start_am33xx_baltos_sdram, r0, r1, r2) */ __raw_writel(0x000010ff, AM33XX_PRM_RSTTIME); - fdt = __dtb_am335x_baltos_minimal_start; + fdt = __dtb_z_am335x_baltos_minimal_start; fdt += get_runtime_offset(); diff --git a/arch/arm/configs/imx23_defconfig b/arch/arm/configs/imx23_defconfig index 26c63814b9..bff9c08c40 100644 --- a/arch/arm/configs/imx23_defconfig +++ b/arch/arm/configs/imx23_defconfig @@ -90,6 +90,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_STM=y CONFIG_MCI=y diff --git a/arch/arm/configs/imx28_defconfig b/arch/arm/configs/imx28_defconfig index 58cda937a8..1acc8dd94f 100644 --- a/arch/arm/configs/imx28_defconfig +++ b/arch/arm/configs/imx28_defconfig @@ -93,6 +93,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_STM=y CONFIG_MCI=y diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 8b8178a96f..5bf908ee85 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -160,6 +160,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_VIDEO=y CONFIG_DRIVER_VIDEO_IMX_IPUV3=y CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y diff --git a/arch/arm/configs/kindle-mx50_defconfig b/arch/arm/configs/kindle-mx50_defconfig index 95b505fda2..855daef71a 100644 --- a/arch/arm/configs/kindle-mx50_defconfig +++ b/arch/arm/configs/kindle-mx50_defconfig @@ -50,6 +50,7 @@ CONFIG_USB_EHCI=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_MCI=y CONFIG_MCI_STARTUP=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y diff --git a/arch/arm/configs/omap_defconfig b/arch/arm/configs/omap_defconfig index ba90158252..9d71d02744 100644 --- a/arch/arm/configs/omap_defconfig +++ b/arch/arm/configs/omap_defconfig @@ -121,6 +121,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_USB_MUSB=y CONFIG_USB_MUSB_AM335X=y CONFIG_USB_MUSB_HOST=y diff --git a/arch/arm/configs/zii_vf610_dev_defconfig b/arch/arm/configs/zii_vf610_dev_defconfig index c9aa60c33e..7161d740ac 100644 --- a/arch/arm/configs/zii_vf610_dev_defconfig +++ b/arch/arm/configs/zii_vf610_dev_defconfig @@ -113,6 +113,7 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DFU=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y CONFIG_MCI=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_IMX_ESDHC=y |