configs: ls1012a: Enable CONFIG_SPI_FLASH_SPANSION in defconfigs

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

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index fc46540a10abbcaba4a28b38e6e0b2d500156fa0..6e9793ab81f57ab1b14a0ebb7c313135d8ed23c4 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -9,22 +9,21 @@
 #ifndef __AT91_SAMA5_COMMON_H
 #define __AT91_SAMA5_COMMON_H
 
+#include <linux/kconfig.h>
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
-#define CONFIG_ARCH_CPU_INIT
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
 /* general purpose I/O */
-#ifndef CONFIG_DM_GPIO
+#if !CONFIG_IS_ENABLED(DM_GPIO)
 #define CONFIG_AT91_GPIO
 #endif
 
-
 /*
  * BOOTP options
  */
@@ -37,13 +36,7 @@
 #ifdef CONFIG_SD_BOOT
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-/* Use raw reserved sectors to save environment */
-#define CONFIG_ENV_OFFSET              0x2000
-#define CONFIG_ENV_SIZE                        0x1000
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#else
-/* u-boot env in sd/mmc card */
-#define CONFIG_ENV_SIZE                0x4000
 #endif
 
 #define CONFIG_BOOTCOMMAND     "if test ! -n ${dtb_name}; then "       \
@@ -57,25 +50,16 @@
 
 #ifdef CONFIG_NAND_BOOT
 /* u-boot env in nand flash */
-#define CONFIG_ENV_OFFSET              0x140000
-#define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000
 #define CONFIG_BOOTCOMMAND             "nand read 0x21000000 0x180000 0x80000;"        \
                                        "nand read 0x22000000 0x200000 0x600000;"       \
                                        "bootz 0x22000000 - 0x21000000"
 #elif CONFIG_SPI_BOOT
 /* u-boot env in serial flash, by default is bus 0 and cs 0 */
-#define CONFIG_ENV_OFFSET              0x6000
-#define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_BOOTCOMMAND             "sf probe 0; "                          \
                                        "sf read 0x21000000 0x60000 0xc000; "   \
                                        "sf read 0x22000000 0x6c000 0x394000; " \
                                        "bootz 0x22000000 - 0x21000000"
 #elif CONFIG_QSPI_BOOT
-#define CONFIG_ENV_OFFSET              0x140000
-#define CONFIG_ENV_SIZE                        0x20000
-#define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_BOOTCOMMAND             "sf probe 0; "                                  \
                                        "sf read 0x21000000 0x180000 0x80000; "         \
                                        "sf read 0x22000000 0x200000 0x600000; "        \