diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-05-22 17:30:51 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-05-26 15:58:56 +0200 |
| commit | a380ce6e9698257c4e8be4c0711b09c90a8febff (patch) | |
| tree | 1643a3efe9c6ffd962942f5124a1a50fd803ce73 /include | |
| parent | 2d8a07475eaa521f0055fc7c2617723a0364fe27 (diff) | |
| download | u-boot-imx-a380ce6e9698257c4e8be4c0711b09c90a8febff.zip u-boot-imx-a380ce6e9698257c4e8be4c0711b09c90a8febff.tar.gz u-boot-imx-a380ce6e9698257c4e8be4c0711b09c90a8febff.tar.bz2 | |
imx6: standardise filesystem and boot options
Move all standard filesystem, partition and fdt options to mx6_common.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/aristainetos-common.h | 9 | ||||
| -rw-r--r-- | include/configs/cgtqmx6eval.h | 6 | ||||
| -rw-r--r-- | include/configs/gw_ventana.h | 9 | ||||
| -rw-r--r-- | include/configs/mx6_common.h | 11 | ||||
| -rw-r--r-- | include/configs/mx6cuboxi.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6qarm2.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 8 | ||||
| -rw-r--r-- | include/configs/mx6slevk.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 6 | ||||
| -rw-r--r-- | include/configs/nitrogen6x.h | 13 | ||||
| -rw-r--r-- | include/configs/novena.h | 8 | ||||
| -rw-r--r-- | include/configs/ot1200.h | 14 | ||||
| -rw-r--r-- | include/configs/platinum.h | 6 | ||||
| -rw-r--r-- | include/configs/secomx6quq7.h | 6 | ||||
| -rw-r--r-- | include/configs/tbs2910.h | 8 | ||||
| -rw-r--r-- | include/configs/titanium.h | 7 | ||||
| -rw-r--r-- | include/configs/tqma6.h | 8 | ||||
| -rw-r--r-- | include/configs/udoo.h | 6 | ||||
| -rw-r--r-- | include/configs/wandboard.h | 6 | ||||
| -rw-r--r-- | include/configs/warp.h | 8 |
20 files changed, 13 insertions, 142 deletions
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 1254e75..d84a908 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -38,9 +38,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -67,7 +64,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -204,8 +200,6 @@ #define CONFIG_ENV_OFFSET (0x0d0000) #define CONFIG_ENV_OFFSET_REDUND (0x0e0000) -#define CONFIG_OF_LIBFDT - #define CONFIG_CMD_CACHE #define CONFIG_SYS_FSL_USDHC_NUM 2 @@ -241,7 +235,6 @@ /* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -251,11 +244,11 @@ #define CONFIG_MXC_USB_FLAGS 0 /* UBI support */ +#define CONFIG_LZO #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE #define CONFIG_RBTREE -#define CONFIG_LZO #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 352b821..3d6010e 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -35,9 +35,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* Miscellaneous commands */ #define CONFIG_CMD_BMODE @@ -129,9 +126,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 37d8814..1b4078c 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -127,12 +127,7 @@ #define CONFIG_BOUNCE_BUFFER /* Filesystem support */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT #define CONFIG_CMD_UBIFS -#define CONFIG_DOS_PARTITION /* * SATA Configs @@ -177,12 +172,10 @@ #define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_GSC #define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_CMD_UBI #define CONFIG_RBTREE -#define CONFIG_LZO #define CONFIG_CMD_FUSE /* eFUSE read/write support */ #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP @@ -275,6 +268,7 @@ /* * MTD Command for mtdparts */ +#define CONFIG_LZO #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS @@ -467,7 +461,6 @@ /* Device Tree Support */ #define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_LIBFDT #define CONFIG_FDT_FIXUP_PARTITIONS #ifndef CONFIG_SYS_DCACHE_OFF diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 07fc3e8..c323038 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -67,6 +67,17 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 +/* Filesystems and image support */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_BOOTZ +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FAT + /* Miscellaneous configurable options */ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 45c12a0..60c3ac9 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -31,10 +31,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* Ethernet Configuration */ #define CONFIG_FEC_MXC @@ -91,7 +87,6 @@ "fi;" /* Command definition */ -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #define CONFIG_MXC_UART_BASE UART1_BASE @@ -223,7 +218,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024) -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_CACHE #endif /* __MX6CUBOXI_CONFIG_H */ diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 720d430..078f616 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -29,8 +29,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -141,9 +139,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - /* USB Configs */ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f7e69d7..0abe38f 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -35,11 +35,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -68,7 +63,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #ifdef CONFIG_SUPPORT_EMMC_BOOT @@ -209,8 +203,6 @@ #define CONFIG_ENV_OFFSET (8 * 64 * 1024) #endif -#define CONFIG_OF_LIBFDT - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 2cced5d..5bb84c4 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -30,8 +30,6 @@ #define CONFIG_MMC #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* I2C Configs */ #define CONFIG_CMD_I2C @@ -170,9 +168,6 @@ #define CONFIG_ENV_IS_IN_MMC #endif -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index a2f03d6..e412803 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -129,9 +129,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* I2C Configs */ #define CONFIG_CMD_I2C @@ -218,9 +215,6 @@ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 62d4dd9..c260d92 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -63,11 +63,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #ifdef CONFIG_MX6Q #define CONFIG_CMD_SATA @@ -101,7 +96,6 @@ /* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -333,9 +327,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif @@ -346,10 +337,6 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_ALT_MEMTEST -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_CMD_FS_GENERIC - /* * PCI express */ diff --git a/include/configs/novena.h b/include/configs/novena.h index d75ccc8..20a077d 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -13,25 +13,17 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT #define CONFIG_MISC_INIT_R -#define CONFIG_DOS_PARTITION -#define CONFIG_FAT_WRITE #define CONFIG_FIT #define CONFIG_KEYBOARD -#define CONFIG_OF_LIBFDT #include "mx6_common.h" /* U-Boot Commands */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_I2C #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index f3c5205..9a74fdd 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -162,24 +162,10 @@ #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD - -/* FS Configs */ -#define CONFIG_CMD_EXT3 -#define CONFIG_CMD_EXT4 -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_LIB_UUID -#define CONFIG_CMD_FS_UUID - #define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_BOOTFILE diff --git a/include/configs/platinum.h b/include/configs/platinum.h index c4ca7b9..b8ba9f9 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -23,8 +23,6 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT #define CONFIG_CMD_FUSE #define CONFIG_CMD_I2C #define CONFIG_CMD_MII @@ -61,7 +59,6 @@ #define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION /* Ethernet config */ #define CONFIG_FEC_MXC @@ -142,9 +139,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -/* Device tree support */ -#define CONFIG_OF_LIBFDT - #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ PHYS_SDRAM_SIZE - (12 << 20)) diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index d34064f..c5d606e 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -38,9 +38,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* Ethernet Configuration */ #define CONFIG_CMD_PING @@ -118,9 +115,6 @@ #define CONFIG_DYNAMIC_MMC_DEVNO #endif -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index de73dd3..01cd0f6 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -56,15 +56,7 @@ #define CONFIG_CMD_TIME /* Filesystems / image support */ -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION -#define CONFIG_CMD_FS_GENERIC - -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_FIT /* MMC */ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index dc875b5..f3d11fa 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -46,9 +46,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -65,7 +62,6 @@ /* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -220,9 +216,6 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 7bcd411..13ce4ab 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -104,13 +104,6 @@ #define CONFIG_MXC_OCOTP #define CONFIG_CMD_FUSE -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_DOS_PARTITION - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII @@ -129,7 +122,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 478754d..7c18d24 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -66,9 +66,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb" @@ -183,9 +180,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index f439413..a8a3ba4 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -51,9 +51,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* USB Configs */ #define CONFIG_CMD_USB @@ -244,9 +241,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/warp.h b/include/configs/warp.h index e9088a2..7ed2d1c 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -35,11 +35,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION /* Command definition */ #undef CONFIG_CMD_NET @@ -77,9 +72,6 @@ /* VDD voltage 1.65 - 1.95 */ #define CONFIG_SYS_SD_VOLTAGE 0x00000080 -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif |