Commit e6825e03627522ad73c6052b087233e0e74c0dd9
Committed by
Minkyu Kang
Minkyu Kang
1 parent
adc7d20631
Exists in
v2017.01-smarct4x
and in
37 other branches
exynos5: Use config_distro_bootcmd.h
This replaces the existing CONFIG_BOOTCOMMAND for exynos5250 and 5420. exynos4 platforms seem to have existing complex extra env configuration for booting and so are excluded here. Hence the bootcmd.h is added to exynos5-common.h. 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 5 changed files with 47 additions and 22 deletions Side-by-side Diff
include/configs/arndale.h
include/configs/exynos5-common.h
| ... | ... | @@ -47,14 +47,6 @@ |
| 47 | 47 | #define CONFIG_SYS_CONSOLE_IS_IN_ENV |
| 48 | 48 | #define CONFIG_CONSOLE_MUX |
| 49 | 49 | |
| 50 | -#define EXYNOS_DEVICE_SETTINGS \ | |
| 51 | - "stdin=serial\0" \ | |
| 52 | - "stdout=serial\0" \ | |
| 53 | - "stderr=serial\0" | |
| 54 | - | |
| 55 | -#define CONFIG_EXTRA_ENV_SETTINGS \ | |
| 56 | - EXYNOS_DEVICE_SETTINGS | |
| 57 | - | |
| 58 | 50 | #define CONFIG_CMD_HASH |
| 59 | 51 | |
| 60 | 52 | /* Thermal Management Unit */ |
| ... | ... | @@ -191,6 +183,43 @@ |
| 191 | 183 | /* Enable FIT support and comparison */ |
| 192 | 184 | #define CONFIG_FIT |
| 193 | 185 | #define CONFIG_FIT_BEST_MATCH |
| 186 | + | |
| 187 | + | |
| 188 | +#define BOOT_TARGET_DEVICES(func) \ | |
| 189 | + func(MMC, mmc, 1) \ | |
| 190 | + func(MMC, mmc, 0) \ | |
| 191 | + func(PXE, pxe, na) \ | |
| 192 | + func(DHCP, dhcp, na) | |
| 193 | + | |
| 194 | +#include <config_distro_bootcmd.h> | |
| 195 | + | |
| 196 | +#ifndef MEM_LAYOUT_ENV_SETTINGS | |
| 197 | +/* 2GB RAM, bootm size of 256M, load scripts after that */ | |
| 198 | +#define MEM_LAYOUT_ENV_SETTINGS \ | |
| 199 | + "bootm_size=0x10000000\0" \ | |
| 200 | + "kernel_addr_r=0x42000000\0" \ | |
| 201 | + "fdt_addr_r=0x43000000\0" \ | |
| 202 | + "ramdisk_addr_r=0x43300000\0" \ | |
| 203 | + "scriptaddr=0x50000000\0" \ | |
| 204 | + "pxefile_addr_r=0x51000000\0" | |
| 205 | +#endif | |
| 206 | + | |
| 207 | +#ifndef EXYNOS_DEVICE_SETTINGS | |
| 208 | +#define EXYNOS_DEVICE_SETTINGS \ | |
| 209 | + "stdin=serial\0" \ | |
| 210 | + "stdout=serial\0" \ | |
| 211 | + "stderr=serial\0" | |
| 212 | +#endif | |
| 213 | + | |
| 214 | +#ifndef EXYNOS_FDTFILE_SETTING | |
| 215 | +#define EXYNOS_FDTFILE_SETTING | |
| 216 | +#endif | |
| 217 | + | |
| 218 | +#define CONFIG_EXTRA_ENV_SETTINGS \ | |
| 219 | + EXYNOS_DEVICE_SETTINGS \ | |
| 220 | + EXYNOS_FDTFILE_SETTING \ | |
| 221 | + MEM_LAYOUT_ENV_SETTINGS \ | |
| 222 | + BOOTENV | |
| 194 | 223 | |
| 195 | 224 | #endif /* __CONFIG_EXYNOS5_COMMON_H */ |
include/configs/exynos5-dt-common.h
| ... | ... | @@ -9,6 +9,13 @@ |
| 9 | 9 | #ifndef __CONFIG_EXYNOS5_DT_COMMON_H |
| 10 | 10 | #define __CONFIG_EXYNOS5_DT_COMMON_H |
| 11 | 11 | |
| 12 | +/* Console configuration */ | |
| 13 | +#undef EXYNOS_DEVICE_SETTINGS | |
| 14 | +#define EXYNOS_DEVICE_SETTINGS \ | |
| 15 | + "stdin=serial,cros-ec-keyb\0" \ | |
| 16 | + "stdout=serial,lcd\0" \ | |
| 17 | + "stderr=serial,lcd\0" | |
| 18 | + | |
| 12 | 19 | #include "exynos5-common.h" |
| 13 | 20 | |
| 14 | 21 | /* PMIC */ |
| ... | ... | @@ -21,16 +28,6 @@ |
| 21 | 28 | #define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ |
| 22 | 29 | #define CONFIG_CMD_CROS_EC |
| 23 | 30 | #define CONFIG_KEYBOARD |
| 24 | - | |
| 25 | -/* Console configuration */ | |
| 26 | -#undef EXYNOS_DEVICE_SETTINGS | |
| 27 | -#define EXYNOS_DEVICE_SETTINGS \ | |
| 28 | - "stdin=serial,cros-ec-keyb\0" \ | |
| 29 | - "stdout=serial,lcd\0" \ | |
| 30 | - "stderr=serial,lcd\0" | |
| 31 | - | |
| 32 | -#define CONFIG_EXTRA_ENV_SETTINGS \ | |
| 33 | - EXYNOS_DEVICE_SETTINGS | |
| 34 | 31 | |
| 35 | 32 | #endif |
include/configs/exynos5250-common.h