| Message ID | 1415529873-1510-1-git-send-email-ijc@hellion.org.uk |
|---|---|
| State | Accepted |
| Commit | adc7d20631930873ff8314319b3c66f2798d6bc6 |
| Headers | show |
Hi, I successfully tested it on my arndale board. Tested-by: Guillaume GARDET <guillaume.gardet@free.fr> Guillaume Le 09/11/2014 11:44, Ian Campbell a écrit : > From: Ian Campbell <ian.campbell@citrix.com> > > ...and remove explicit setting of things which this implies. This is done for > all exynos platforms (4 & 5) so it is added to exynos-common.h > > I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD > > I have build tested on all exynos platforms (MAKEALL -s exynos), but only boot > tested on arndale. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > include/configs/arndale.h | 2 -- > include/configs/exynos-common.h | 13 ++----------- > include/configs/exynos5-common.h | 11 ----------- > 3 files changed, 2 insertions(+), 24 deletions(-) > > diff --git a/include/configs/arndale.h b/include/configs/arndale.h > index f9ee40f..a87806d 100644 > --- a/include/configs/arndale.h > +++ b/include/configs/arndale.h > @@ -17,8 +17,6 @@ > /* allow to overwrite serial and ethaddr */ > #define CONFIG_ENV_OVERWRITE > > -#define CONFIG_CMD_EXT2 > - > /* USB */ > #define CONFIG_USB_EHCI > #define CONFIG_USB_EHCI_EXYNOS > diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h > index b258cb9..1246305 100644 > --- a/include/configs/exynos-common.h > +++ b/include/configs/exynos-common.h > @@ -30,9 +30,6 @@ > #define CONFIG_SKIP_LOWLEVEL_INIT > #define CONFIG_BOARD_EARLY_INIT_F > > -/* Enable fdt support */ > -#define CONFIG_OF_LIBFDT > - > /* Keep L2 Cache Disabled */ > #define CONFIG_CMD_CACHE > > @@ -42,7 +39,6 @@ > #define CONFIG_SETUP_MEMORY_TAGS > #define CONFIG_CMDLINE_TAG > #define CONFIG_INITRD_TAG > -#define CONFIG_CMDLINE_EDITING > #define CONFIG_ENV_OVERWRITE > > /* Size of malloc() pool before and after relocation */ > @@ -61,7 +57,6 @@ > #define CONFIG_EXYNOS_DWMMC > #define CONFIG_BOUNCE_BUFFER > > -#define CONFIG_BOOTDELAY 3 > #define CONFIG_ZERO_BOOTDELAY_CHECK > > /* PWM */ > @@ -71,20 +66,14 @@ > #include <config_cmd_default.h> > > #define CONFIG_CMD_MMC > -#define CONFIG_CMD_EXT4 > #define CONFIG_CMD_EXT4_WRITE > -#define CONFIG_CMD_FAT > #define CONFIG_FAT_WRITE > #define CONFIG_CMD_FS_GENERIC > > -#define CONFIG_DOS_PARTITION > -#define CONFIG_EFI_PARTITION > #define CONFIG_CMD_PART > #define CONFIG_PARTITION_UUIDS > > /* Miscellaneous configurable options */ > -#define CONFIG_SYS_LONGHELP /* undef to save memory */ > -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ > #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ > #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ > #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ > @@ -96,4 +85,6 @@ > #define CONFIG_SYS_NO_FLASH > #undef CONFIG_CMD_IMLS > > +#include <config_distro_defaults.h> > + > #endif /* __CONFIG_H */ > diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h > index ba591e7..b03966d 100644 > --- a/include/configs/exynos5-common.h > +++ b/include/configs/exynos5-common.h > @@ -55,9 +55,6 @@ > #define CONFIG_EXTRA_ENV_SETTINGS \ > EXYNOS_DEVICE_SETTINGS > > -#define CONFIG_CMD_PING > -#define CONFIG_CMD_ELF > -#define CONFIG_CMD_NET > #define CONFIG_CMD_HASH > > /* Thermal Management Unit */ > @@ -174,12 +171,6 @@ > #define CONFIG_ENV_SROM_BANK 1 > #endif /*CONFIG_CMD_NET*/ > > -/* Enable PXE Support */ > -#ifdef CONFIG_CMD_NET > -#define CONFIG_CMD_PXE > -#define CONFIG_MENU > -#endif > - > /* SHA hashing */ > #define CONFIG_CMD_HASH > #define CONFIG_HASH_VERIFY > @@ -189,8 +180,6 @@ > /* Enable Time Command */ > #define CONFIG_CMD_TIME > > -#define CONFIG_CMD_BOOTZ > - > #define CONFIG_CMD_GPIO > > /* USB boot mode */
diff --git a/include/configs/arndale.h b/include/configs/arndale.h index f9ee40f..a87806d 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -17,8 +17,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CMD_EXT2 - /* USB */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_EXYNOS diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index b258cb9..1246305 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -30,9 +30,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F -/* Enable fdt support */ -#define CONFIG_OF_LIBFDT - /* Keep L2 Cache Disabled */ #define CONFIG_CMD_CACHE @@ -42,7 +39,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_EDITING #define CONFIG_ENV_OVERWRITE /* Size of malloc() pool before and after relocation */ @@ -61,7 +57,6 @@ #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK /* PWM */ @@ -71,20 +66,14 @@ #include <config_cmd_default.h> #define CONFIG_CMD_MMC -#define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT #define CONFIG_FAT_WRITE #define CONFIG_CMD_FS_GENERIC -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION #define CONFIG_CMD_PART #define CONFIG_PARTITION_UUIDS /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ @@ -96,4 +85,6 @@ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS +#include <config_distro_defaults.h> + #endif /* __CONFIG_H */ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index ba591e7..b03966d 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -55,9 +55,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS -#define CONFIG_CMD_PING -#define CONFIG_CMD_ELF -#define CONFIG_CMD_NET #define CONFIG_CMD_HASH /* Thermal Management Unit */ @@ -174,12 +171,6 @@ #define CONFIG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/ -/* Enable PXE Support */ -#ifdef CONFIG_CMD_NET -#define CONFIG_CMD_PXE -#define CONFIG_MENU -#endif - /* SHA hashing */ #define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY @@ -189,8 +180,6 @@ /* Enable Time Command */ #define CONFIG_CMD_TIME -#define CONFIG_CMD_BOOTZ - #define CONFIG_CMD_GPIO /* USB boot mode */