diff options
| author | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2016-11-21 15:20:02 +0100 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-03-09 01:40:08 +0100 |
| commit | 5c1632bf1f814b0926ba0359d9cba7f732ac7f84 (patch) | |
| tree | 6b807831a1f3c142c8698770eec68b5f30f2642b /include | |
| parent | 4d3af52f95927e7f52c2c4b58c524bd071a6e40b (diff) | |
Remove CONFIG_DISPLAY_CPUINFO; rename CONFIG_DEFAULT_CONSOLE_ENV -> CONSOLE_DEFAULT
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index aff4b23d58..211abfa5f4 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -41,11 +41,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ -/* - * Display CPU information - */ -#define CONFIG_DISPLAY_CPUINFO - #ifdef CONFIG_SUNXI_PANGOLIN # undef CONFIG_SYS_PROMPT # define CONFIG_SYS_PROMPT "u-boot# " @@ -583,9 +578,9 @@ extern int soft_i2c_gpio_scl; "name=data,size=-,uuid=933ac7e1-2eb4-4f13-b844-0e14e2aef915;" #if (CONFIG_CONS_INDEX == 1) -#define CONFIG_DEFAULT_CONSOLE_ENV "console=ttyS0,115200\0" +#define CONSOLE_DEFAULT "console=ttyS0,115200\0" #elif (CONFIG_CONS_INDEX == 3) -#define CONFIG_DEFAULT_CONSOLE_ENV "console=ttyS2,115200\0" +#define CONSOLE_DEFAULT "console=ttyS2,115200\0" #else #error "CONFIG_CONS_INDEX to CONFIG_DEFAULT_CONSOLE_ENV missing." #endif @@ -600,7 +595,7 @@ extern int soft_i2c_gpio_scl; "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,size=-,uuid=69dad710-2ce4-4e3c-b16c-21a1d49abed3\0" \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - CONFIG_DEFAULT_CONSOLE_ENV \ + CONSOLE_DEFAULT \ BOOTCMD_SUNXI_COMPAT \ BOOTENV |