Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 179c760..071d928 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -1,17 +1,13 @@
+/* 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_ARCH_RMOBILE_BOARD_STRING       "KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
 #include <asm/arch/rmobile.h>
@@ -28,7 +24,6 @@
 #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)
@@ -68,8 +63,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 */
@@ -86,7 +79,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 */