Commit adc7d20631930873ff8314319b3c66f2798d6bc6
Committed by
Minkyu Kang
Minkyu Kang
1 parent
4f29862487
Exists in
v2017.01-smarct4x
and in
37 other branches
exynos: Enable config_distro_defaults.h
...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> Tested-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Showing 3 changed files with 2 additions and 24 deletions Side-by-side Diff
include/configs/arndale.h
include/configs/exynos-common.h
| ... | ... | @@ -30,9 +30,6 @@ |
| 30 | 30 | #define CONFIG_SKIP_LOWLEVEL_INIT |
| 31 | 31 | #define CONFIG_BOARD_EARLY_INIT_F |
| 32 | 32 | |
| 33 | -/* Enable fdt support */ | |
| 34 | -#define CONFIG_OF_LIBFDT | |
| 35 | - | |
| 36 | 33 | /* Keep L2 Cache Disabled */ |
| 37 | 34 | #define CONFIG_CMD_CACHE |
| 38 | 35 | |
| ... | ... | @@ -42,7 +39,6 @@ |
| 42 | 39 | #define CONFIG_SETUP_MEMORY_TAGS |
| 43 | 40 | #define CONFIG_CMDLINE_TAG |
| 44 | 41 | #define CONFIG_INITRD_TAG |
| 45 | -#define CONFIG_CMDLINE_EDITING | |
| 46 | 42 | #define CONFIG_ENV_OVERWRITE |
| 47 | 43 | |
| 48 | 44 | /* Size of malloc() pool before and after relocation */ |
| ... | ... | @@ -61,7 +57,6 @@ |
| 61 | 57 | #define CONFIG_EXYNOS_DWMMC |
| 62 | 58 | #define CONFIG_BOUNCE_BUFFER |
| 63 | 59 | |
| 64 | -#define CONFIG_BOOTDELAY 3 | |
| 65 | 60 | #define CONFIG_ZERO_BOOTDELAY_CHECK |
| 66 | 61 | |
| 67 | 62 | /* PWM */ |
| 68 | 63 | |
| 69 | 64 | |
| 70 | 65 | |
| ... | ... | @@ -71,20 +66,14 @@ |
| 71 | 66 | #include <config_cmd_default.h> |
| 72 | 67 | |
| 73 | 68 | #define CONFIG_CMD_MMC |
| 74 | -#define CONFIG_CMD_EXT4 | |
| 75 | 69 | #define CONFIG_CMD_EXT4_WRITE |
| 76 | -#define CONFIG_CMD_FAT | |
| 77 | 70 | #define CONFIG_FAT_WRITE |
| 78 | 71 | #define CONFIG_CMD_FS_GENERIC |
| 79 | 72 | |
| 80 | -#define CONFIG_DOS_PARTITION | |
| 81 | -#define CONFIG_EFI_PARTITION | |
| 82 | 73 | #define CONFIG_CMD_PART |
| 83 | 74 | #define CONFIG_PARTITION_UUIDS |
| 84 | 75 | |
| 85 | 76 | /* Miscellaneous configurable options */ |
| 86 | -#define CONFIG_SYS_LONGHELP /* undef to save memory */ | |
| 87 | -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ | |
| 88 | 77 | #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ |
| 89 | 78 | #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ |
| 90 | 79 | #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ |
| ... | ... | @@ -95,6 +84,8 @@ |
| 95 | 84 | /* FLASH and environment organization */ |
| 96 | 85 | #define CONFIG_SYS_NO_FLASH |
| 97 | 86 | #undef CONFIG_CMD_IMLS |
| 87 | + | |
| 88 | +#include <config_distro_defaults.h> | |
| 98 | 89 | |
| 99 | 90 | #endif /* __CONFIG_H */ |
include/configs/exynos5-common.h
| ... | ... | @@ -55,9 +55,6 @@ |
| 55 | 55 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 56 | 56 | EXYNOS_DEVICE_SETTINGS |
| 57 | 57 | |
| 58 | -#define CONFIG_CMD_PING | |
| 59 | -#define CONFIG_CMD_ELF | |
| 60 | -#define CONFIG_CMD_NET | |
| 61 | 58 | #define CONFIG_CMD_HASH |
| 62 | 59 | |
| 63 | 60 | /* Thermal Management Unit */ |
| ... | ... | @@ -174,12 +171,6 @@ |
| 174 | 171 | #define CONFIG_ENV_SROM_BANK 1 |
| 175 | 172 | #endif /*CONFIG_CMD_NET*/ |
| 176 | 173 | |
| 177 | -/* Enable PXE Support */ | |
| 178 | -#ifdef CONFIG_CMD_NET | |
| 179 | -#define CONFIG_CMD_PXE | |
| 180 | -#define CONFIG_MENU | |
| 181 | -#endif | |
| 182 | - | |
| 183 | 174 | /* SHA hashing */ |
| 184 | 175 | #define CONFIG_CMD_HASH |
| 185 | 176 | #define CONFIG_HASH_VERIFY |
| ... | ... | @@ -188,8 +179,6 @@ |
| 188 | 179 | |
| 189 | 180 | /* Enable Time Command */ |
| 190 | 181 | #define CONFIG_CMD_TIME |
| 191 | - | |
| 192 | -#define CONFIG_CMD_BOOTZ | |
| 193 | 182 | |
| 194 | 183 | #define CONFIG_CMD_GPIO |
| 195 | 184 |