diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/UCP1020.h | 2 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 2 | ||||
| -rw-r--r-- | include/configs/dragonboard410c.h | 1 | ||||
| -rw-r--r-- | include/configs/meson-gx-common.h | 7 | ||||
| -rw-r--r-- | include/configs/vme8349.h | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6231a1e4ae..b5ff5d3fe1 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -70,8 +70,6 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_ETHPRIME "eTSEC1" -#ifndef CONFIG_SPI_FLASH -#endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_SYS_L2_SIZE (256 << 10) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index d2cd440311..ebfdd1c7a3 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -40,7 +40,6 @@ #ifdef CONFIG_DIRECT_NOR_BOOT #define CONFIG_ARCH_CPU_INIT -#define CONFIG_DA8XX_GPIO #define CONFIG_SYS_DV_NOR_BOOT_CFG (0x11) #endif @@ -227,6 +226,7 @@ #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ #endif +#define CONFIG_DA8XX_GPIO /* * U-Boot general configuration */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 86fa735470..46a7179f1b 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -94,6 +94,7 @@ REFLASH(dragonboard/u-boot.img, 8)\ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 /* mmc0 = emmc, mmc1 = sd */ +#define CONFIG_SYS_MMC_ENV_PART 2 /* Set env partition to BOOT2 partition */ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) diff --git a/include/configs/meson-gx-common.h b/include/configs/meson-gx-common.h index 6e61b704a3..7435f3475e 100644 --- a/include/configs/meson-gx-common.h +++ b/include/configs/meson-gx-common.h @@ -23,10 +23,17 @@ #define GICD_BASE 0xc4301000 #define GICC_BASE 0xc4302000 +#ifdef CONFIG_CMD_USB +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) +#else +#define BOOT_TARGET_DEVICES_USB(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ + BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 0d8ae0b099..2456475f27 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -257,9 +257,6 @@ #undef PCI_ONE_PCI1 #endif -#ifndef VME_CADDY2 -#endif - #undef CONFIG_EEPRO100 #undef CONFIG_TULIP |