Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / include / configs / km / kmp204x-common.h

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index a0c932a..c762c93 100644 (file)
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -1,15 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013 Keymile AG
  * Valentin Longchamp <valentin.longchamp@keymile.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_KMP204X_H
 #define _CONFIG_KMP204X_H
 
-#define CONFIG_SYS_TEXT_BASE   0xfff40000
-
 #define CONFIG_KM_DEF_NETDEV   "netdev=eth0\0"
 
 /* an additionnal option is required for UBI as subpage access is
@@ -31,7 +28,6 @@
 /* High Level Configuration Options */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
 #define CONFIG_FSL_CORENET             /* Freescale CoreNet platform */
-#define CONFIG_MP                      /* support multiple processors */
 
 #define CONFIG_SYS_FSL_CPC             /* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
@@ -43,7 +39,6 @@
 #define CONFIG_SYS_DPAA_RMAN           /* RMan */
 
 /* Environment in SPI Flash */
-#define CONFIG_SYS_EXTRA_ENV_RELOC
 #define CONFIG_ENV_SPI_BUS              0
 #define CONFIG_ENV_SPI_CS               0
 #define CONFIG_ENV_SPI_MAX_HZ           20000000
@@ -190,14 +185,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
 #define CONFIG_SYS_OR1_PRELIM  CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
 
-/* bootcounter in QRIO */
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_SYS_BOOTCOUNT_ADDR      (CONFIG_SYS_QRIO_BASE + 0x20)
-
-#define CONFIG_BOARD_EARLY_INIT_R      /* call board_early_init_r function */
 #define CONFIG_MISC_INIT_F
-#define CONFIG_MISC_INIT_R
-#define CONFIG_LAST_STAGE_INIT
 
 #define CONFIG_HWCONFIG
 
@@ -225,7 +213,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  * open - index 2
  * shorted - index 1
  */
-#define CONFIG_CONS_INDEX      1
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         (get_bus_freq(0)/2)
@@ -266,7 +253,6 @@ int get_scl(void);
 /*
  * eSPI - Enhanced SPI
  */
-#define CONFIG_SPI_FLASH_BAR   /* 4 byte-addressing */
 #define CONFIG_SF_DEFAULT_SPEED         20000000
 #define CONFIG_SF_DEFAULT_MODE          0
 
@@ -334,7 +320,6 @@ int get_scl(void);
 
 #define CONFIG_FMAN_ENET
 #define CONFIG_PHYLIB_10G
-#define CONFIG_PHY_MARVELL             /* there is a marvell phy */
 
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
@@ -364,7 +349,6 @@ int get_scl(void);
  */
 
 /* we don't need flash support */
-#undef CONFIG_FLASH_CFI_MTD
 #undef CONFIG_JFFS2_CMDLINE
 
 /*
@@ -400,7 +384,7 @@ int get_scl(void);
                "cramfsload ${fdt_addr_r} "                             \
                "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
        "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0"              \
-       "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.pbl\0"           \
+       "u-boot="CONFIG_HOSTNAME "/u-boot.pbl\0"                \
        "update="                                                       \
                "sf probe 0;sf erase 0 +${filesize};"                   \
                "sf write ${load_addr_r} 0 ${filesize};\0"              \