Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / kzm9g.h

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 7b8f29788d227957a13a60473fcec6d95f818176..5a2b040225bb1bb71ebc6c2403414caa2c85e428 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -1,35 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  * Copyright (C) 2012 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __KZM9G_H
 #define __KZM9G_H
 
-#undef DEBUG
-
 #define CONFIG_SH73A0
-#define CONFIG_KZM_A9_GT
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING       "KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
 #include <asm/arch/rmobile.h>
 
-#define CONFIG_ARCH_CPU_INIT
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#undef  CONFIG_SHOW_BOOT_PROGRESS
-
 /* MEMORY */
 #define KZM_SDRAM_BASE (0x40000000)
 #define PHYS_SDRAM             KZM_SDRAM_BASE
 #define PHYS_SDRAM_SIZE                (512 * 1024 * 1024)
-#define CONFIG_NR_DRAM_BANKS   (1)
 
 /* NOR Flash */
 #define KZM_FLASH_BASE (0x00000000)
@@ -39,7 +29,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      (512)
 
 /* prompt */
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PBSIZE              256
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200 }
 
@@ -49,7 +38,6 @@
 #define CONFIG_SYS_MEMTEST_START       (KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \
        (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
-#undef  CONFIG_SYS_ALT_MEMTEST
 #undef  CONFIG_SYS_MEMTEST_SCRATCH
 #undef  CONFIG_SYS_LOADS_BAUD_CHANGE
 
@@ -71,8 +59,6 @@
 #define CONFIG_STANDALONE_LOAD_ADDR    0x41000000
 
 /* FLASH */
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_CFI
 #undef  CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_SYS_FLASH_EMPTY_INFO
 #define FLASH_SECTOR_SIZE      (256 * 1024)    /* 256 KB sectors */
@@ -89,7 +75,6 @@
 /* Timeout for Flash clear lock bit operations (in ms) */
 #define CONFIG_SYS_FLASH_UNLOCK_TOUT   (3 * 1000)
 
-#undef  CONFIG_SYS_FLASH_PROTECTION
 #undef  CONFIG_SYS_DIRECT_FLASH_TFTP
 
 /* GPIO / PFC */