Merge git://git.denx.de/u-boot-sunxi

[u-boot] / include / configs / km / km_arm.h

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index faa3d94a95030f7f1de0e0281864c1e6ab7a52a7..9245d32ba919ad4cb3d0281acef2cc0129d403bb 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
@@ -8,8 +9,6 @@
  *
  * (C) Copyright 2010-2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -69,7 +68,7 @@
                " boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}"
 
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0"           \
+       "u-boot="CONFIG_HOSTNAME "/u-boot.kwb\0"                \
        CONFIG_KM_UPDATE_UBOOT                                          \
        "set_fdthigh=setenv fdt_high ${kernelmem}\0"                    \
        "checkfdt="                                                     \
@@ -98,8 +97,6 @@
  * for your console driver.
  */
 
-#define CONFIG_CONS_INDEX      1       /* Console on UART0 */
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
@@ -276,8 +273,6 @@ int get_scl(void);
 #define CONFIG_KM_RESERVED_PRAM 0x801000
 /* address for the bootcount (taken from end of RAM) */
 #define BOOTCOUNT_ADDR          (CONFIG_KM_RESERVED_PRAM)
-/* Use generic bootcount RAM driver */
-#define CONFIG_BOOTCOUNT_RAM
 
 /* enable POST tests */
 #define CONFIG_POST    (CONFIG_SYS_POST_MEM_REGIONS)