projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2019-11-20-env-migration'
[platform/kernel/u-boot.git]
/
include
/
configs
/
s5pc210_universal.h
diff --git
a/include/configs/s5pc210_universal.h
b/include/configs/s5pc210_universal.h
index
d489ec2
..
ec9abaf
100644
(file)
--- a/
include/configs/s5pc210_universal.h
+++ b/
include/configs/s5pc210_universal.h
@@
-23,12
+23,11
@@
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
/* select serial console configuration */
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
/* select serial console configuration */
-#define CONFIG_SERIAL2
/* Console configuration */
#define CONFIG_BOOTCOMMAND "run mmcboot"
/* Console configuration */
#define CONFIG_BOOTCOMMAND "run mmcboot"
-#define CONFIG_DEFAULT_CONSOLE "
ttySAC1,115200n8
"
+#define CONFIG_DEFAULT_CONSOLE "
console=ttySAC1,115200n8\0
"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE)
@@
-57,8
+56,6
@@
#define CONFIG_UBIBLOCK "9"
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
#define CONFIG_UBIBLOCK "9"
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
-#define CONFIG_ENV_SIZE 4096
-#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */
#define CONFIG_ENV_UBIFS_OPTION " rootflags=bulk_read,no_chk_data_crc "
#define CONFIG_ENV_FLASHBOOT CONFIG_ENV_UBI_MTD CONFIG_ENV_UBIFS_OPTION \
#define CONFIG_ENV_UBIFS_OPTION " rootflags=bulk_read,no_chk_data_crc "
#define CONFIG_ENV_FLASHBOOT CONFIG_ENV_UBI_MTD CONFIG_ENV_UBIFS_OPTION \
@@
-109,7
+106,7
@@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \
"rootfstype=ext4\0" \
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \
"rootfstype=ext4\0" \
- "console=" CONFIG_DEFAULT_CONSOLE
"\0"
\
+ "console=" CONFIG_DEFAULT_CONSOLE \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT \
"mbrparts=" MBRPARTS_DEFAULT \
"meminfo=crashkernel=32M@0x50000000\0" \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT \
"mbrparts=" MBRPARTS_DEFAULT \
"meminfo=crashkernel=32M@0x50000000\0" \
@@
-143,8
+140,6
@@
int universal_spi_read(void);
/* Common misc for Samsung */
#define CONFIG_MISC_COMMON
/* Common misc for Samsung */
#define CONFIG_MISC_COMMON
-#define CONFIG_MISC_INIT_R
-
/* Download menu - Samsung common */
#define CONFIG_LCD_MENU
/* Download menu - Samsung common */
#define CONFIG_LCD_MENU