flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / include / configs / sama5d3xek.h

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index ed91bdc12434b748b30315b7b52ea999b151a7e4..13790e7244b178ff9b655ebb0598322110b6113a 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -13,13 +13,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * If has No NOR flash, please put the definition: CONFIG_SYS_NO_FLASH
- * before the common header.
- */
 #include "at91-sama5_common.h"
 
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 /* serial console */
@@ -52,7 +47,7 @@
 #define CONFIG_SAMA5D3_LCD_BASE                0x23E00000
 
 /* NOR flash */
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_PROTECTION
@@ -113,8 +108,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI0
 #endif
@@ -129,7 +122,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE          ATMEL_BASE_OHCI
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "sama5d3"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     3
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* USB device */