April 2017 - U-Boot

[U-Boot] [PATCH] video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP
by Philipp Tomsich 02 May '17

02 May '17

Due to a typo, the 24 bit-per-pixel configuration ends in 24BMP instead of 24BPP. This change renames it throughout the source tree for consistency and to make moving these options into Kconfig easier and less error-prone. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- common/lcd.c | 4 ++-- drivers/video/video_bmp.c | 4 ++-- include/configs/brxre1.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index 783626e..2405146 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -704,7 +704,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } break; #endif /* CONFIG_BMP_16BPP */ -#if defined(CONFIG_BMP_24BMP) +#if defined(CONFIG_BMP_24BPP) case 24: for (i = 0; i < height; ++i) { for (j = 0; j < width; j++) { @@ -716,7 +716,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) fb -= lcd_line_length + width * (bpix / 8); } break; -#endif /* CONFIG_BMP_24BMP */ +#endif /* CONFIG_BMP_24BPP */ #if defined(CONFIG_BMP_32BPP) case 32: for (i = 0; i < height; ++i) { diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 32a4e7f..f803067 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -316,7 +316,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, } break; #endif /* CONFIG_BMP_16BPP */ -#if defined(CONFIG_BMP_24BMP) +#if defined(CONFIG_BMP_24BPP) case 24: for (i = 0; i < height; ++i) { for (j = 0; j < width; j++) { @@ -328,7 +328,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, fb -= priv->line_length + width * (bpix / 8); } break; -#endif /* CONFIG_BMP_24BMP */ +#endif /* CONFIG_BMP_24BPP */ #if defined(CONFIG_BMP_32BPP) case 32: for (i = 0; i < height; ++i) { diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 82ee7c6..6cd166a 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -23,7 +23,7 @@ #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) #define CONFIG_CMD_BMP -#define CONFIG_BMP_24BMP +#define CONFIG_BMP_24BPP #define CONFIG_BMP_32BPP /* memory */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5e515d2..59fa89d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -247,7 +247,7 @@ CONFIG_BL1_SIZE CONFIG_BL2_OFFSET CONFIG_BL2_SIZE CONFIG_BMP_16BPP -CONFIG_BMP_24BMP +CONFIG_BMP_24BPP CONFIG_BMP_24BPP CONFIG_BMP_32BPP CONFIG_BOARDDIR -- 1.9.1

3 2

[U-Boot] [PATCH] fdt: Move fdt_fixup_ethernet to a common place
by Tom Rini 02 May '17

02 May '17

With 3f66149d9fb4 we no longer have a common call fdt_fixup_ethernet. This was fine to do on PowerPC as they largely had calls already in ft_cpu_fixup. On ARM however we largely relied on this call. Rather than introduce a large number of changes to ft_cpu_fixup / ft_board_fixup we recognize that this is a common enough call that we should be doing it in a central location. Do it early enough that we can do any further updates in ft_cpu_fixup / ft_board_fixup. Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Chen-Yu Tsai <wens(a)csie.org> Cc: Maxime Ripard <maxime.ripard(a)free-electrons.com> Cc: Thomas Chou <thomas(a)wytron.com.tw> (maintainer:NIOS) Cc: York Sun <york.sun(a)nxp.com> (maintainer:POWERPC MPC85XX) Cc: Stefan Roese <sr(a)denx.de> (maintainer:POWERPC PPC4XX) Cc: Simon Glass <sjg(a)chromium.org> Cc: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com> Fixes: 3f66149d9fb4 ("Remove extra fdt_fixup_ethernet() call") Signed-off-by: Tom Rini <trini(a)konsulko.com> --- This replaces my previous patch to fix just rpi. --- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 -- arch/nios2/cpu/Makefile | 1 - arch/nios2/cpu/fdt.c | 38 -------------------------------------- arch/powerpc/cpu/mpc512x/cpu.c | 3 --- arch/powerpc/cpu/mpc8260/cpu.c | 5 ----- arch/powerpc/cpu/mpc83xx/fdt.c | 1 - arch/powerpc/cpu/mpc85xx/fdt.c | 2 -- arch/powerpc/cpu/mpc86xx/fdt.c | 5 ----- arch/powerpc/cpu/mpc8xx/fdt.c | 3 --- arch/powerpc/cpu/ppc4xx/fdt.c | 6 ------ common/bootm_os.c | 2 -- common/image-fdt.c | 2 ++ configs/10m50_defconfig | 1 - configs/3c120_defconfig | 1 - 14 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 arch/nios2/cpu/fdt.c diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index ae5e794230cd..d21ad39f8adc 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -94,8 +94,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) } #endif - fdt_fixup_ethernet(blob); - off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4); while (off != -FDT_ERR_NOTFOUND) { val = gd->cpu_clk; diff --git a/arch/nios2/cpu/Makefile b/arch/nios2/cpu/Makefile index 185ca3cdb76e..c859b46bf830 100644 --- a/arch/nios2/cpu/Makefile +++ b/arch/nios2/cpu/Makefile @@ -8,4 +8,3 @@ extra-y = start.o obj-y = exceptions.o obj-y += cpu.o interrupts.o traps.o -obj-y += fdt.o diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c deleted file mode 100644 index a44f51a7f2a8..000000000000 --- a/arch/nios2/cpu/fdt.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * (C) Copyright 2011, Missing Link Electronics - * Joachim Foerster <joachim(a)missinglinkelectronics.com> - * - * Taken from arch/powerpc/cpu/ppc4xx/fdt.c: - * - * (C) Copyright 2007-2008 - * Stefan Roese, DENX Software Engineering, sr(a)denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> - -#ifdef CONFIG_OF_BOARD_SETUP -#include <libfdt.h> -#include <fdt_support.h> - -DECLARE_GLOBAL_DATA_PTR; - -int __ft_board_setup(void *blob, bd_t *bd) -{ - ft_cpu_setup(blob, bd); - - return 0; -} -int ft_board_setup(void *blob, bd_t *bd) - __attribute__((weak, alias("__ft_board_setup"))); - -void ft_cpu_setup(void *blob, bd_t *bd) -{ - /* - * Fixup all ethernet nodes - * Note: aliases in the dts are required for this - */ - fdt_fixup_ethernet(blob); -} -#endif /* CONFIG_OF_BOARD_SETUP */ diff --git a/arch/powerpc/cpu/mpc512x/cpu.c b/arch/powerpc/cpu/mpc512x/cpu.c index 4ee91e16f9c6..ce524fcdc797 100644 --- a/arch/powerpc/cpu/mpc512x/cpu.c +++ b/arch/powerpc/cpu/mpc512x/cpu.c @@ -176,9 +176,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) old_ft_cpu_setup(blob, bd); #endif ft_clock_setup(blob, bd); -#ifdef CONFIG_HAS_ETH0 - fdt_fixup_ethernet(blob); -#endif fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } #endif diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 58d1c0261cba..7302b37f2095 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -294,11 +294,6 @@ void watchdog_reset (void) #ifdef CONFIG_OF_BOARD_SETUP void ft_cpu_setup (void *blob, bd_t *bd) { -#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ - defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob); -#endif - do_fixup_by_compat_u32(blob, "fsl,cpm2-brg", "clock-frequency", bd->bi_brgfreq, 1); diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index f249a585edf1..3ac4eb1dd8f2 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -53,7 +53,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) ||\ defined(CONFIG_HAS_ETH4) || defined(CONFIG_HAS_ETH5) - fdt_fixup_ethernet(blob); #ifdef CONFIG_MPC8313 /* * mpc8313e erratum IPIC1 swapped TSEC interrupt ID numbers on rev. 1 diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 67140ba9ee18..a9ea947305ff 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -612,8 +612,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) } #endif - fdt_fixup_ethernet(blob); - fdt_add_enet_stashing(blob); #ifndef CONFIG_FSL_TBCLK_EXTRA_DIV diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 5f9ad6b0b6d4..30fbf14f1bdb 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -32,11 +32,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); -#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) \ - || defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob); -#endif - #ifdef CONFIG_SYS_NS16550 do_fixup_by_compat_u32(blob, "ns16550", "clock-frequency", CONFIG_SYS_NS16550_CLK, 1); diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c index 97830e3c8bd4..34d36478d30a 100644 --- a/arch/powerpc/cpu/mpc8xx/fdt.c +++ b/arch/powerpc/cpu/mpc8xx/fdt.c @@ -23,8 +23,5 @@ void ft_cpu_setup(void *blob, bd_t *bd) do_fixup_by_compat_u32(blob, "fsl,cpm-brg", "clock-frequency", gd->arch.brg_clk, 1); - /* Fixup ethernet MAC addresses */ - fdt_fixup_ethernet(blob); - fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index c73509b3ee35..28080583a792 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -150,12 +150,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) } /* - * Fixup all ethernet nodes - * Note: aliases in the dts are required for this - */ - fdt_fixup_ethernet(blob); - - /* * Fixup all available PCIe nodes by setting the device_type property */ fdt_pcie_setup(blob); diff --git a/common/bootm_os.c b/common/bootm_os.c index 6e463c317e84..e1024069766a 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -288,8 +288,6 @@ void do_bootvx_fdt(bootm_headers_t *images) if (ret) return; - fdt_fixup_ethernet(*of_flat_tree); - ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { bootline = getenv("bootargs"); diff --git a/common/image-fdt.c b/common/image-fdt.c index 7468b902b8d4..c6e8832d6688 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -478,6 +478,8 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } + /* Update ethernet nodes */ + fdt_fixup_ethernet(blob); if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index 68da5ff11088..ed9a867d7287 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -2,7 +2,6 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="10m50_devboard" CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard" CONFIG_FIT=y -CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index 9adf97adb638..95e794afca86 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -2,7 +2,6 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="3c120_devboard" CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_FIT=y -CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y -- 1.9.1

5 5

[U-Boot] [PATCH 1/1] odroid-c2: README: MMC is supported
by Heinrich Schuchardt 01 May '17

01 May '17

Mention eMMC and microSD as supported devices. They have been enabled with patch d0c5c8d529f16fa88ab52a3b5dd2d4fc03664f19 odroid-c2: enable new Meson GX MMC driver in board defconfig which was accepted for u-boot-mmc.git. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Possibly the patch should be handled via u-boot-mmc.git. --- board/amlogic/odroid-c2/README | 1 + 1 file changed, 1 insertion(+) diff --git a/board/amlogic/odroid-c2/README b/board/amlogic/odroid-c2/README index d6d266a5ce..b407c04952 100644 --- a/board/amlogic/odroid-c2/README +++ b/board/amlogic/odroid-c2/README @@ -18,6 +18,7 @@ Schematics are available on the manufacturer website. Currently the u-boot port supports the following devices: - serial + - eMMC, microSD - Ethernet u-boot compilation -- 2.11.0

3 3

[U-Boot] [PATCH 0/2] Enable MMC and PXE boot on meson-gxbb systems.
by Vagrant Cascadian 01 May '17

01 May '17

The first patch enables MMC boot support, and the second enables PXE boot support. Vagrant Cascadian (2): Enable MMC boot on meson-gxbb. Enable PXE boot on meson-gxbb. include/configs/meson-gxbb-common.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.11.0

2 8

[U-Boot] [PATCH 1/1] odroid-c2: change ramdisk_addr_r
by Heinrich Schuchardt 01 May '17

01 May '17

0x10000000 is the start of a 2 MiB area used by ARM Trusted Firmware (BL31). So we should not load the ramdisk here. The legacy Ubuntu image comes with the following line in boot.ini: setenv initrd_loadaddr "0x13000000" See http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.… http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.… So let's use the same address. With the patch booting Linux with booti succeeds, without the patch Linux hangs. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/configs/meson-gxbb-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3fbfcef..66b37a6 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -50,7 +50,7 @@ "scriptaddr=0x1f000000\0" \ "kernel_addr_r=0x01080000\0" \ "pxefile_addr_r=0x01080000\0" \ - "ramdisk_addr_r=0x10000000\0" \ + "ramdisk_addr_r=0x13000000\0" \ MESON_FDTFILE_SETTING \ BOOTENV -- 2.1.4

5 6

[U-Boot] [PATCH v2 1/1] odroid-c2: enable MMC as boot target
by Heinrich Schuchardt 01 May '17

01 May '17

To enable automatic booting from SD card or eMMC the MMC devices 0 and 1 are added to the BOOT_TARGET_DEVICES. Booting from SD card, eMMC, and DHCP are tried in sequence. A missing or failing device is gracefully handled. Cc: Andreas Färber <afaerber(a)suse.de> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: Enhance commit message to clearly indicate how the boot targets are sequenced. v1: This is a resubmission of https://lists.denx.de/pipermail/u-boot/2017-April/287315.html where this patch was part of patch series which was no longer applicable. --- include/configs/meson-gxbb-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index cc2b5b6..388f239 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -39,6 +39,8 @@ #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -- 2.1.4

4 7

[U-Boot] [PATCH] warp7: MAINTAINERS: Add warp7_secure_defconfig entry
by Fabio Estevam 01 May '17

01 May '17

From: Fabio Estevam <fabio.estevam(a)nxp.com> Add warp7_secure_defconfig entry to avoid the following warning: WARNING: no maintainers for 'warp7_secure' Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- board/warp7/MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/board/warp7/MAINTAINERS b/board/warp7/MAINTAINERS index 1d3ee29..0fc9746 100644 --- a/board/warp7/MAINTAINERS +++ b/board/warp7/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/warp7/ F: include/configs/warp7.h F: configs/warp7_defconfig +F: configs/warp7_secure_defconfig -- 2.7.4

2 1

[U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support
by Sylvain Lemieux 01 May '17

01 May '17

From: Liam Beguin <lbeguin(a)tycoint.com> Add DM support for i2c functions. Signed-off-by: Liam Beguin <lbeguin(a)tycoint.com> Signed-off-by: Sylvain Lemieux <slemieux(a)tycoint.com> --- Changes from v2 to v3: * Code clean-up to remove conditional compile else section (CONFIG_DM_I2C). * As suggested by Marek, added Simon Glass to the list of cc for the patch. Changes from v1 to v2: * Do not request udevice on each single i2c write. Note: * This patch is require as part of the DM support of the LPC32xx I2C driver. All I2C drivers should be converted, to DM, by the end of June 2017. * The USB driver is supporting the DM and non-DM API. * Once the ustream LPC32xx boards (devkit3250 & work_92105) are migrated to DM (I2C), the non-DM API support can be remove from this driver. drivers/usb/host/ohci-lpc32xx.c | 64 +++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c index 9245126ed6..c0c423b994 100644 --- a/drivers/usb/host/ohci-lpc32xx.c +++ b/drivers/usb/host/ohci-lpc32xx.c @@ -14,8 +14,10 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h> +#include <asm/arch/i2c.h> #include <usb.h> #include <i2c.h> +#include <dm.h> /* OTG I2C controller module register structures */ struct otgi2c_regs { @@ -81,14 +83,20 @@ struct otg_regs { static struct otg_regs *otg = (struct otg_regs *)USB_BASE; static struct clk_pm_regs *clk_pwr = (struct clk_pm_regs *)CLK_PM_BASE; -static int isp1301_set_value(int reg, u8 value) +static int isp1301_set_value(struct udevice *dev, int reg, u8 value) { +#ifndef CONFIG_DM_I2C return i2c_write(ISP1301_I2C_ADDR, reg, 1, &value, 1); +#else + return dm_i2c_write(dev, reg, &value, 1); +#endif } -static void isp1301_configure(void) +static void isp1301_configure(struct udevice *dev) { +#ifndef CONFIG_DM_I2C i2c_set_bus_num(I2C_2); +#endif /* * LPC32XX only supports DAT_SE0 USB mode @@ -96,23 +104,23 @@ static void isp1301_configure(void) */ /* Disable transparent UART mode first */ - isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN); + isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN); - isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG); - isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG); - isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_CLR, ~0); - isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_SET, + isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG); + isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG); + isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_CLR, ~0); + isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_SET, MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL); - isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR, ~0); - isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0); - isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, + isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR, ~0); + isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0); + isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN); - isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR, + isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR, OTG1_DM_PULLUP | OTG1_DP_PULLUP); - isp1301_set_value(ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0); - isp1301_set_value(ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0); - isp1301_set_value(ISP1301_I2C_INTERRUPT_RISING_CLR, ~0); + isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0); + isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0); + isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_RISING_CLR, ~0); /* Enable usb_need_clk clock after transceiver is initialized */ setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_USBDVND_EN); @@ -149,6 +157,15 @@ static int usbpll_setup(void) int usb_cpu_init(void) { u32 ret; + struct udevice *dev = NULL; + +#ifdef CONFIG_DM_I2C + ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev); + if (ret) { + debug("%s: No bus %d\n", __func__, I2C_2); + return ret; + } +#endif /* * USB pins routing setup is done by "lpc32xx_usb_init()" and should @@ -167,7 +184,7 @@ int usb_cpu_init(void) return ret; /* Configure ISP1301 */ - isp1301_configure(); + isp1301_configure(dev); /* setup USB clocks and PLL */ ret = usbpll_setup(); @@ -188,21 +205,32 @@ int usb_cpu_init(void) return ret; setbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN); - isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV); + isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV); return 0; } int usb_cpu_stop(void) { + struct udevice *dev = NULL; + int ret = 0; + +#ifdef CONFIG_DM_I2C + ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev); + if (ret) { + debug("%s: No bus %d\n", __func__, I2C_2); + return ret; + } +#endif + /* vbus off */ - isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV); + isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV); clrbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN); clrbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_HCLK_EN); - return 0; + return ret; } int usb_cpu_init_fail(void) -- 2.11.0

3 3

[U-Boot] [PATCH 00/28] Kconfig: Convert some commands to Kconfig
by Simon Glass 01 May '17

01 May '17

We plan to convert all CONFIG options to Kconfig by the end of 2017. This series contributes to that effort by converting most of the commands from A to D to Kconfig. Some invalid or bogus ones are removed. Two filesystem commands are split so there are separate options to enable the filesystem and the command that uses it. Simon Glass (28): power: Rename CONFIG_AS3722_POWER to CONFIG_PMIC_AS3722 power: Move as3722 pmic to pmic/ directory power: Convert CONFIG_PMIC_AS3722 to Kconfig power: Drop CONFIG_I2C_PMIC power: Drop CONFIG_PMIC Convert CONFIG_CMD_AES et al to Kconfig ti816x_evm: Change CONFIG_CMD_ASKEN to CONFIG_CMD_ASKENV Convert CONFIG_CMD_BAT to Kconfig Convert CONFIG_CMD_BEDBUG to Kconfig Convert CONFIG_CMD_BLOB to Kconfig Convert CONFIG_CMD_BMODE to Kconfig Convert CONFIG_CMD_BMP to Kconfig Convert CONFIG_CMD_BSP to Kconfig Convert CONFIG_SYS_WHITE_ON_BLACK to Kconfig fs: Convert CONFIG_CMD_CBFS to Kconfig fs: Kconfig: Add a separate config for FS_CBFS Convert CONFIG_CMD_CHIP_CONFIG to Kconfig Drop CONFIG_CMD_CLEAR Convert CONFIG_CMD_CLK to Kconfig fs: Convert CONFIG_CMD_CRAMFS to Kconfig fs: Kconfig: Add a separate option for FS_CRAMFS Kconfig: Drop CONFIG_CMD_DEFAULTENV_VARS Convert CONFIG_CMD_DEKBLOB to Kconfig Kconfig: Drop CONFIG_CMD_DFL Convert CONFIG_CMD_DIAG to Kconfig Convert CONFIG_CMD_DISPLAY to Kconfig powerpc: Drop configs/manroland Drop the pdsp188x driver README | 25 --- arch/arm/imx-common/Kconfig | 20 ++ arch/arm/include/asm/fsl_secure_boot.h | 1 - arch/arm/mach-tegra/board2.c | 2 +- arch/powerpc/cpu/ppc4xx/Kconfig | 8 + arch/powerpc/include/asm/fsl_secure_boot.h | 1 - board/gateworks/gw_ventana/common.c | 7 +- board/ti/sdp4430/Kconfig | 3 + cmd/Kconfig | 131 +++++++++++++ cmd/Makefile | 2 +- configs/B4860QDS_SECURE_BOOT_defconfig | 1 + configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 1 + configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 1 + configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 1 + configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 1 + .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 + .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 + .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 + .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8610HPCD_defconfig | 1 + configs/MiniFAP_defconfig | 3 + configs/O3DNT_defconfig | 1 + configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 1 + .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 1 + .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 1 + configs/P2041RDB_SECURE_BOOT_defconfig | 1 + configs/P3041DS_NAND_SECURE_BOOT_defconfig | 1 + configs/P3041DS_SECURE_BOOT_defconfig | 1 + configs/P4080DS_SECURE_BOOT_defconfig | 1 + configs/P5020DS_NAND_SECURE_BOOT_defconfig | 1 + configs/P5020DS_SECURE_BOOT_defconfig | 1 + configs/P5040DS_NAND_SECURE_BOOT_defconfig | 1 + configs/P5040DS_SECURE_BOOT_defconfig | 1 + configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PMC405DE_defconfig | 2 + configs/PMC440_defconfig | 1 + configs/T1023RDB_SECURE_BOOT_defconfig | 1 + configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 2 + configs/T1024QDS_DDR4_defconfig | 1 + configs/T1024QDS_NAND_defconfig | 1 + configs/T1024QDS_SDCARD_defconfig | 1 + configs/T1024QDS_SECURE_BOOT_defconfig | 2 + configs/T1024QDS_SPIFLASH_defconfig | 1 + configs/T1024QDS_defconfig | 1 + configs/T1024RDB_SECURE_BOOT_defconfig | 1 + configs/T1040D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1040QDS_DDR4_defconfig | 1 + configs/T1040QDS_SECURE_BOOT_defconfig | 2 + configs/T1040QDS_defconfig | 1 + configs/T1040RDB_SECURE_BOOT_defconfig | 1 + configs/T1042D4RDB_NAND_defconfig | 1 + configs/T1042D4RDB_SDCARD_defconfig | 1 + configs/T1042D4RDB_SECURE_BOOT_defconfig | 2 + configs/T1042D4RDB_SPIFLASH_defconfig | 1 + configs/T1042D4RDB_defconfig | 1 + configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 2 + configs/T1042RDB_PI_NAND_defconfig | 1 + configs/T1042RDB_PI_SDCARD_defconfig | 1 + configs/T1042RDB_PI_SPIFLASH_defconfig | 1 + configs/T1042RDB_PI_defconfig | 1 + configs/T1042RDB_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080RDB_SECURE_BOOT_defconfig | 1 + configs/T4160QDS_SECURE_BOOT_defconfig | 1 + configs/T4240QDS_SECURE_BOOT_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 2 + configs/TQM5200S_defconfig | 2 + configs/TQM5200_B_HIGHBOOT_defconfig | 3 + configs/TQM5200_B_defconfig | 3 + configs/TQM5200_STK100_defconfig | 3 + configs/TQM5200_defconfig | 3 + configs/TQM823L_LCD_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/UCP1020_SPIFLASH_defconfig | 2 + configs/UCP1020_defconfig | 2 + configs/VOM405_defconfig | 1 + configs/a3m071_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/a4m2k_defconfig | 1 + configs/acadia_defconfig | 1 + configs/amcore_defconfig | 1 + configs/apalis-tk1_defconfig | 1 + configs/apalis_imx6_defconfig | 2 + configs/apalis_imx6_nospl_com_defconfig | 2 + configs/apalis_imx6_nospl_it_defconfig | 2 + configs/apf27_defconfig | 1 + configs/arches_defconfig | 1 + configs/aristainetos2_defconfig | 2 + configs/aristainetos2b_defconfig | 2 + configs/aristainetos_defconfig | 2 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9263ek_dataflash_cs0_defconfig | 1 + configs/at91sam9263ek_dataflash_defconfig | 1 + configs/at91sam9263ek_nandflash_defconfig | 1 + configs/at91sam9263ek_norflash_boot_defconfig | 1 + configs/at91sam9263ek_norflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9m10g45ek_mmc_defconfig | 1 + configs/at91sam9m10g45ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_mmc_defconfig | 1 + configs/at91sam9n12ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_spiflash_defconfig | 1 + configs/at91sam9rlek_dataflash_defconfig | 1 + configs/at91sam9rlek_mmc_defconfig | 1 + configs/at91sam9rlek_nandflash_defconfig | 1 + configs/at91sam9x5ek_dataflash_defconfig | 1 + configs/at91sam9x5ek_mmc_defconfig | 1 + configs/at91sam9x5ek_nandflash_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/brppt1_mmc_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + configs/brxre1_defconfig | 2 + configs/bubinga_defconfig | 1 + configs/calimain_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/cei-tk1-som_defconfig | 1 + configs/cgtqmx6eval_defconfig | 1 + configs/charon_defconfig | 3 + configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + configs/cm5200_defconfig | 2 + configs/cm_fx6_defconfig | 1 + configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/colibri_imx6_defconfig | 2 + configs/colibri_imx6_nospl_defconfig | 2 + configs/colibri_imx7_defconfig | 2 + configs/colibri_t20_defconfig | 2 + configs/colibri_vf_defconfig | 6 +- ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_defconfig | 1 + configs/coreboot-x86_defconfig | 2 + configs/da850_am18xxevm_defconfig | 1 + configs/da850evm_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/digsy_mtc_RAMBOOT_defconfig | 2 + configs/digsy_mtc_defconfig | 2 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 2 + configs/digsy_mtc_rev5_defconfig | 2 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/ea20_defconfig | 2 + configs/ethernut5_defconfig | 1 + configs/evb-rk3288_defconfig | 2 +- configs/evb-rk3328_defconfig | 5 +- configs/evb-rk3399_defconfig | 25 +-- configs/fennec-rk3288_defconfig | 2 +- configs/firefly-rk3288_defconfig | 2 +- configs/fo300_defconfig | 3 + configs/gdppc440etx_defconfig | 1 + configs/ge_b450v3_defconfig | 1 + configs/ge_b650v3_defconfig | 1 + configs/ge_b850v3_defconfig | 1 + configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/gwventana_emmc_defconfig | 5 +- configs/gwventana_gw5904_defconfig | 5 +- configs/gwventana_nand_defconfig | 7 +- configs/haleakala_defconfig | 1 + configs/harmony_defconfig | 1 + configs/icnova-a20-swac_defconfig | 3 +- configs/icon_defconfig | 2 + configs/imx31_phycore_eet_defconfig | 1 + configs/imx6q_logic_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 3 + configs/km_kirkwood_defconfig | 3 + configs/km_kirkwood_pci_defconfig | 3 + configs/kmcoge4_defconfig | 2 + configs/kmcoge5ne_defconfig | 3 + configs/kmcoge5un_defconfig | 3 + configs/kmeter1_defconfig | 2 + configs/kmlion1_defconfig | 2 + configs/kmnusa_defconfig | 3 + configs/kmopti2_defconfig | 2 + configs/kmsugp1_defconfig | 3 + configs/kmsupx5_defconfig | 2 + configs/kmsuv31_defconfig | 3 + configs/kmtegr1_defconfig | 3 + configs/kmtepr2_defconfig | 2 + configs/kmvect1_defconfig | 3 + configs/legoev3_defconfig | 1 + configs/liteboard_defconfig | 1 + configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 18 +- configs/ls1021aqds_ddr4_nor_defconfig | 3 +- configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 3 +- configs/ls1021aqds_nand_defconfig | 3 +- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 4 +- configs/ls1021aqds_nor_defconfig | 3 +- configs/ls1021aqds_nor_lpuart_defconfig | 3 +- configs/ls1021aqds_qspi_defconfig | 3 +- configs/ls1021aqds_sdcard_ifc_defconfig | 3 +- configs/ls1021aqds_sdcard_qspi_defconfig | 3 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 4 +- configs/ls1021atwr_nor_defconfig | 3 +- configs/ls1021atwr_nor_lpuart_defconfig | 3 +- configs/ls1021atwr_qspi_defconfig | 3 +- .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 4 +- configs/ls1021atwr_sdcard_ifc_defconfig | 3 +- configs/ls1021atwr_sdcard_qspi_defconfig | 3 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 4 +- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 11 +- configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 9 +- configs/ls1046aqds_SECURE_BOOT_defconfig | 3 +- configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 3 +- configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 7 +- configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 2 + configs/m28evk_defconfig | 1 + configs/m53evk_defconfig | 1 + configs/makalu_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mcx_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/mgcoge3ne_defconfig | 2 + configs/mgcoge3un_defconfig | 3 + configs/mgcoge_defconfig | 2 + configs/miqi-rk3288_defconfig | 2 +- configs/motionpro_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/mx23evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/mx53evk_defconfig | 1 + configs/mx6dlsabreauto_defconfig | 1 + configs/mx6dlsabresd_defconfig | 1 + configs/mx6qpsabreauto_defconfig | 1 + configs/mx6qsabreauto_defconfig | 1 + configs/mx6qsabrelite_defconfig | 2 + configs/mx6qsabresd_defconfig | 1 + configs/mx6sabresd_spl_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/mx6sxsabresd_spl_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 2 + configs/mx6ul_9x9_evk_defconfig | 2 + configs/mx6ull_14x14_evk_defconfig | 1 + configs/mx6ull_14x14_evk_plugin_defconfig | 1 + configs/mx7dsabresd_defconfig | 1 + configs/mx7dsabresd_secure_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 2 + configs/nitrogen6dl_defconfig | 2 + configs/nitrogen6q2g_defconfig | 2 + configs/nitrogen6q_defconfig | 2 + configs/nitrogen6s1g_defconfig | 2 + configs/nitrogen6s_defconfig | 2 + configs/novena_defconfig | 1 + configs/nyan-big_defconfig | 3 + configs/omap4_sdp4430_defconfig | 1 + configs/omapl138_lcdk_defconfig | 5 +- configs/opos6uldev_defconfig | 7 +- configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/paz00_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pic32mzdask_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/platinum_picon_defconfig | 1 + configs/platinum_titanium_defconfig | 1 + configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/popmetal-rk3288_defconfig | 2 +- configs/portl2_defconfig | 3 + configs/puma-rk3399_defconfig | 6 +- configs/pxm2_defconfig | 1 + configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/rock2_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + configs/rut_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sama5d3xek_mmc_defconfig | 1 + configs/sama5d3xek_nandflash_defconfig | 1 + configs/sama5d3xek_spiflash_defconfig | 1 + configs/sama5d4ek_mmc_defconfig | 6 +- configs/sama5d4ek_nandflash_defconfig | 6 +- configs/sama5d4ek_spiflash_defconfig | 2 +- configs/sandbox_defconfig | 5 + configs/sandbox_noblk_defconfig | 5 + configs/sandbox_spl_defconfig | 5 + configs/seaboard_defconfig | 2 + configs/secomx6quq7_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/snow_defconfig | 1 + configs/socrates_defconfig | 1 + configs/spring_defconfig | 1 + configs/suvd3_defconfig | 2 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/tec_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + configs/tinker-rk3288_defconfig | 2 +- configs/titanium_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/tqma6dl_mba6_mmc_defconfig | 1 + configs/tqma6dl_mba6_spi_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/trats2_defconfig | 5 +- configs/trats_defconfig | 3 +- configs/tuge1_defconfig | 2 + configs/tuxx1_defconfig | 2 + configs/udoo_defconfig | 1 + configs/v38b_defconfig | 1 + configs/ventana_defconfig | 1 + configs/walnut_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/wtk_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xpress_defconfig | 1 + configs/xpress_spl_defconfig | 1 + configs/xtfpga_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zc5202_defconfig | 1 + configs/zc5601_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + drivers/misc/Makefile | 1 - drivers/misc/pdsp188x.c | 45 ----- drivers/power/Makefile | 1 - drivers/power/pmic/Kconfig | 8 + drivers/power/pmic/Makefile | 1 + drivers/power/{ => pmic}/as3722.c | 0 drivers/video/Kconfig | 8 + fs/Kconfig | 2 + fs/Makefile | 2 +- fs/cbfs/Kconfig | 8 + fs/cramfs/Kconfig | 7 + include/config_cmd_all.h | 6 - include/config_fallbacks.h | 4 - include/configs/CPCI2DP.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/M52277EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/P1022DS.h | 1 - include/configs/PATI.h | 1 - include/configs/PIP405.h | 1 - include/configs/PMC405DE.h | 2 - include/configs/PMC440.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/TQM5200.h | 9 - include/configs/TQM823L.h | 4 - include/configs/UCP1020.h | 1 - include/configs/VOM405.h | 1 - include/configs/a3m071.h | 1 - include/configs/a4m072.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/amcc-common.h | 1 - include/configs/amcore.h | 3 - include/configs/apalis-tk1.h | 3 - include/configs/apalis_imx6.h | 2 - include/configs/apf27.h | 1 - include/configs/aristainetos-common.h | 3 - include/configs/aristainetos2.h | 2 - include/configs/aristainetos2b.h | 2 - include/configs/armadillo-800eva.h | 1 - include/configs/arndale.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 2 - include/configs/calimain.h | 1 - include/configs/canyonlands.h | 1 - include/configs/cei-tk1-som.h | 3 - include/configs/cgtqmx6eval.h | 1 - include/configs/cm5200.h | 2 - include/configs/cm_fx6.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/colibri_imx6.h | 2 - include/configs/colibri_imx7.h | 3 - include/configs/colibri_pxa270.h | 2 - include/configs/colibri_t20.h | 2 - include/configs/colibri_vf.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/da850evm.h | 1 - include/configs/dbau1x00.h | 1 - include/configs/dfi-bt700.h | 1 - include/configs/digsy_mtc.h | 4 - include/configs/dlvision-10g.h | 1 - include/configs/dlvision.h | 1 - include/configs/ea20.h | 2 - include/configs/el6x_common.h | 1 - include/configs/embestmx6boards.h | 2 - include/configs/ethernut5.h | 1 - include/configs/evb_rk3288.h | 2 - include/configs/evb_rk3328.h | 1 - include/configs/evb_rk3399.h | 2 - include/configs/exynos5-dt-common.h | 1 - include/configs/fennec_rk3288.h | 2 - include/configs/firefly-rk3288.h | 2 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 2 - include/configs/harmony.h | 1 - include/configs/icon.h | 4 - include/configs/imx27lite-common.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/imx6_logic.h | 1 - include/configs/intip.h | 1 - include/configs/io.h | 1 - include/configs/io64.h | 1 - include/configs/ipam390.h | 1 - include/configs/ipek01.h | 3 - include/configs/jetson-tk1.h | 3 - include/configs/katmai.h | 1 - include/configs/kilauea.h | 1 - include/configs/km/keymile-common.h | 3 - include/configs/km/km8309-common.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/km8360.h | 1 - include/configs/legoev3.h | 1 - include/configs/liteboard.h | 2 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/lwmon5.h | 5 - include/configs/m28evk.h | 2 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/manroland/common.h | 107 ----------- include/configs/manroland/mpc5200-common.h | 205 --------------------- include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/miqi_rk3288.h | 2 - include/configs/motionpro.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/mt_ventoux.h | 1 - include/configs/mx23evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 3 - include/configs/mx6ullevk.h | 2 - include/configs/mx7_common.h | 1 - include/configs/mx7dsabresd.h | 1 - include/configs/neo.h | 1 - include/configs/nitrogen6x.h | 3 - include/configs/nokia_rx51.h | 2 - include/configs/novena.h | 1 - include/configs/nyan-big.h | 3 - include/configs/o2dnt-common.h | 3 - include/configs/o3dnt.h | 1 - include/configs/omap4_sdp4430.h | 3 - include/configs/omapl138_lcdk.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/ot1200.h | 1 - include/configs/paz00.h | 1 - include/configs/pb1x00.h | 1 - include/configs/pcm058.h | 1 - include/configs/pdm360ng.h | 4 - include/configs/pengwyn.h | 2 - include/configs/pic32mzdask.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/platinum.h | 1 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/popmetal_rk3288.h | 2 - include/configs/puma_rk3399.h | 2 - include/configs/pxm2.h | 1 - include/configs/rcar-gen2-common.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/rock2.h | 2 - include/configs/rpi.h | 1 - include/configs/rut.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/sandbox.h | 3 - include/configs/seaboard.h | 2 - include/configs/secomx6quq7.h | 1 - include/configs/sequoia.h | 2 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/socrates.h | 1 - include/configs/t3corp.h | 1 - include/configs/tbs2910.h | 1 - include/configs/tec.h | 1 - include/configs/theadorable.h | 2 - include/configs/ti816x_evm.h | 2 +- include/configs/tinker_rk3288.h | 2 - include/configs/titanium.h | 1 - include/configs/topic_miami.h | 1 - include/configs/tqma6.h | 1 - include/configs/trats.h | 1 - include/configs/trats2.h | 1 - include/configs/udoo.h | 1 - include/configs/v38b.h | 1 - include/configs/vct.h | 1 - include/configs/ventana.h | 1 - include/configs/veyron.h | 2 - include/configs/wandboard.h | 1 - include/configs/x86-chromebook.h | 2 - include/configs/x86-common.h | 4 - include/configs/xilinx-ppc.h | 1 - include/configs/xpress.h | 2 - include/configs/xtfpga.h | 1 - include/configs/zynq-common.h | 1 - lib/Kconfig | 13 ++ scripts/config_whitelist.txt | 24 --- 582 files changed, 772 insertions(+), 786 deletions(-) delete mode 100644 drivers/misc/pdsp188x.c rename drivers/power/{ => pmic}/as3722.c (100%) create mode 100644 fs/cbfs/Kconfig delete mode 100644 include/configs/manroland/common.h delete mode 100644 include/configs/manroland/mpc5200-common.h -- 2.13.0.rc0.306.g87b477812d-goog

3 57

[U-Boot] [PATCH] arm: Re-sync ARCH_MX5 / MX51 / MX53 CONFIG options
by Tom Rini 01 May '17

01 May '17

A few boards had not been fully re-synced with CONFIG_ARCH_MX5 / CONFIG_MX51 / CONFIG_MX53 being in Kconfig. Do so now. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/Kconfig | 46 ------------------------------------------ arch/arm/cpu/armv7/mx5/Kconfig | 46 ++++++++++++++++++++++++++++++++++++++---- configs/m53evk_defconfig | 3 ++- configs/mx51evk_defconfig | 1 + configs/mx53ard_defconfig | 1 + configs/mx53evk_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx53smd_defconfig | 1 + configs/ts4800_defconfig | 2 +- include/configs/m53evk.h | 1 - include/configs/mx51evk.h | 2 -- include/configs/mx53ard.h | 2 -- include/configs/mx53evk.h | 2 -- include/configs/mx53loco.h | 2 -- include/configs/mx53smd.h | 2 -- include/configs/ts4800.h | 1 - include/configs/usbarmory.h | 1 - 17 files changed, 50 insertions(+), 65 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index aec0a65..513a35f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -584,40 +584,6 @@ config ARCH_MX5 select CPU_V7 select BOARD_EARLY_INIT_F -config TARGET_M53EVK - bool "Support m53evk" - select CPU_V7 - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - -config TARGET_MX51EVK - bool "Support mx51evk" - select BOARD_LATE_INIT - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53ARD - bool "Support mx53ard" - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53EVK - bool "Support mx53evk" - select BOARD_LATE_INIT - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53LOCO - bool "Support mx53loco" - select BOARD_LATE_INIT - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53SMD - bool "Support mx53smd" - select CPU_V7 - select BOARD_EARLY_INIT_F - config ARCH_RMOBILE bool "Renesas ARM SoCs" select DM @@ -683,11 +649,6 @@ config TARGET_TS4600 select CPU_ARM926EJS select SUPPORT_SPL -config TARGET_TS4800 - bool "Support TS4800" - select CPU_V7 - select SYS_FSL_ERRATUM_ESDHC_A001 - config ARCH_VF610 bool "Freescale Vybrid" select CPU_V7 @@ -1099,7 +1060,6 @@ source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig" source "board/aries/m28evk/Kconfig" -source "board/aries/m53evk/Kconfig" source "board/bosch/shc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" @@ -1135,11 +1095,6 @@ source "board/freescale/mx28evk/Kconfig" source "board/freescale/mx31ads/Kconfig" source "board/freescale/mx31pdk/Kconfig" source "board/freescale/mx35pdk/Kconfig" -source "board/freescale/mx51evk/Kconfig" -source "board/freescale/mx53ard/Kconfig" -source "board/freescale/mx53evk/Kconfig" -source "board/freescale/mx53loco/Kconfig" -source "board/freescale/mx53smd/Kconfig" source "board/freescale/s32v234evb/Kconfig" source "board/gdsys/a38x/Kconfig" source "board/grinn/chiliboard/Kconfig" @@ -1167,7 +1122,6 @@ source "board/birdland/bav335x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/technologic/ts4600/Kconfig" -source "board/technologic/ts4800/Kconfig" source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig index 7b55747..516fd1a 100644 --- a/arch/arm/cpu/armv7/mx5/Kconfig +++ b/arch/arm/cpu/armv7/mx5/Kconfig @@ -14,24 +14,62 @@ choice prompt "MX5 board select" optional -config TARGET_USBARMORY - bool "Support USB armory" - select CPU_V7 +config TARGET_M53EVK + bool "Support m53evk" + select MX53 + select SUPPORT_SPL + +config TARGET_MX51EVK + bool "Support mx51evk" + select BOARD_LATE_INIT + select MX51 + +config TARGET_MX53ARD + bool "Support mx53ard" + select MX53 config TARGET_MX53CX9020 bool "Support CX9020" select BOARD_LATE_INIT - select CPU_V7 select MX53 select DM select DM_SERIAL +config TARGET_MX53EVK + bool "Support mx53evk" + select BOARD_LATE_INIT + select MX53 + +config TARGET_MX53LOCO + bool "Support mx53loco" + select BOARD_LATE_INIT + select MX53 + +config TARGET_MX53SMD + bool "Support mx53smd" + select MX53 + +config TARGET_TS4800 + bool "Support TS4800" + select MX51 + select SYS_FSL_ERRATUM_ESDHC_A001 + +config TARGET_USBARMORY + bool "Support USB armory" + endchoice config SYS_SOC default "mx5" +source "board/aries/m53evk/Kconfig" source "board/beckhoff/mx53cx9020/Kconfig" +source "board/freescale/mx51evk/Kconfig" +source "board/freescale/mx53ard/Kconfig" +source "board/freescale/mx53evk/Kconfig" +source "board/freescale/mx53loco/Kconfig" +source "board/freescale/mx53smd/Kconfig" source "board/inversepath/usbarmory/Kconfig" +source "board/technologic/ts4800/Kconfig" endif diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index 0258a84..d4152f5 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_M53EVK=y +CONFIG_ARCH_MX5=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_M53EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_VIDEO=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 9ac4b65..b385009 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX51EVK=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg" diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig index 886296b..51d3bfb 100644 --- a/configs/mx53ard_defconfig +++ b/configs/mx53ard_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53ARD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/mx53evk_defconfig b/configs/mx53evk_defconfig index 9a05a8b..2c54942 100644 --- a/configs/mx53evk_defconfig +++ b/configs/mx53evk_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53EVK=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53evk/imximage.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index a7a4813..5b62f03 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53LOCO=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg" diff --git a/configs/mx53smd_defconfig b/configs/mx53smd_defconfig index 93b20d7..95ca52e 100644 --- a/configs/mx53smd_defconfig +++ b/configs/mx53smd_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53SMD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53smd/imximage.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/ts4800_defconfig b/configs/ts4800_defconfig index 255eedf..5a4bf27 100644 --- a/configs/ts4800_defconfig +++ b/configs/ts4800_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TS4800=y CONFIG_BOOTDELAY=1 -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index d40b9f2..9731d49 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -8,7 +8,6 @@ #ifndef __M53EVK_CONFIG_H__ #define __M53EVK_CONFIG_H__ -#define CONFIG_MX53 #define CONFIG_MXC_GPIO #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 98c9f9b..726d3c8 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -13,8 +13,6 @@ /* High Level Configuration Options */ -#define CONFIG_MX51 /* in a mx51 */ - #define CONFIG_SYS_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000 diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 8612614..aee6e70 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_ARD #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index b8d59cc..63bd80d 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_EVK #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index fed40eb..945be58 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_LOCO #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index e9d570e..d064337 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_SMD #include <asm/arch/imx-regs.h> diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index a65c5f1..7bb8c87 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -14,7 +14,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_MX51 #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index a67802a..58b62d2 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -11,7 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 #define CONFIG_SYS_FSL_CLK #define CONFIG_MXC_GPIO -- 2.1.4

1 1