Convert CONFIG_SPL_NAND_DRIVERS et al to Kconfig

[platform/kernel/u-boot.git] / include / configs / gardena-smart-gateway-at91sam.h

diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h
index 02bf4d1..d0149f8 100644 (file)
--- a/include/configs/gardena-smart-gateway-at91sam.h
+++ b/include/configs/gardena-smart-gateway-at91sam.h
@@ -9,6 +9,10 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12 MHz crystal */
@@ -43,12 +47,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x22000000      /* load address */
 
-/* environment organization */
-#define CONFIG_ENV_UBI_PART            "ubi"
-#define CONFIG_ENV_UBI_VOLUME          "env"
-#define CONFIG_ENV_UBI_VOLUME_REDUND   "env_r"
-#define CONFIG_ENV_SIZE                        (64 << 10)
-
 /* SPL */
 #define CONFIG_SPL_MAX_SIZE            0x7000
 #define CONFIG_SPL_STACK               0x308000
@@ -65,12 +63,10 @@
 #define CONFIG_SYS_MCKR                        0x1301
 #define CONFIG_SYS_MCKR_CSS            0x1302
 
-#define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_RAW_ONLY
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    0xa0000
-#define        CONFIG_SYS_UBOOT_START          CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_NAND_U_BOOT_START    CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_DST     CONFIG_SYS_TEXT_BASE