etamin: Rework CONFIG_NAND_CS_INIT
Enable this in the board Kconfig file, but then check for it via
CONFIG_IS_ENABLED so that it will only be true in the non-SPL case, as
is done today. As part of this we move some defines local to where
they are used as it's board specific.
Cc: Samuel Egli <samuel.egli@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 6647148..811c7cb 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -127,16 +127,6 @@
"bootm ${kloadaddr} - ${loadaddr}\0" \
COMMON_ENV_NAND_CMDS
-#ifndef CONFIG_SPL_BUILD
-
-#define CONFIG_NAND_CS_INIT
-#define ETAMIN_NAND_GPMC_CONFIG1 0x00000800
-#define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00
-#define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00
-#define ETAMIN_NAND_GPMC_CONFIG4 0x16051807
-#define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e
-#define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80
-
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
"hostname=etamin\0" \
@@ -147,5 +137,5 @@
CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
CONFIG_ENV_SETTINGS_V2 \
CONFIG_ENV_SETTINGS_NAND_V2
-#endif /* CONFIG_SPL_BUILD */
+
#endif /* ! __CONFIG_ETAMIN_H */