mtd: nand: Make CONFIG_SYS_NAND_U_BOOT_OFFS configurable through Kconfig

[karo-tx-uboot.git] / include / configs / ti_omap5_common.h

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 4faffef0479266a0d6db5207a2819562ba268a09..1c1f8c0830d82de84fe15e3de39dd0491eb32332 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -40,14 +40,12 @@
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 #endif
 
-#ifndef CONFIG_SPL_BUILD
 #define CONFIG_PALMAS_POWER
-#endif
 
 #include <asm/arch/cpu.h>
 #include <asm/arch/omap.h>
 
-#include <configs/ti_armv7_common.h>
+#include <configs/ti_armv7_omap.h>
 
 /*
  * Hardware drivers
@@ -57,9 +55,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         48000000
 
-/* Per-SoC commands */
-#undef CONFIG_CMD_NFS
-
 /*
  * Environment setup
  */
@@ -71,6 +66,7 @@
 #define DFUARGS
 #endif
 
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
@@ -83,6 +79,7 @@
        "vram=16M\0" \
        "partitions=" PARTS_DEFAULT "\0" \
        "optargs=\0" \
+       "dofastboot=0\0" \
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \
        "mmcrootfstype=ext4 rootwait\0" \
@@ -137,7 +134,7 @@
        "if test ${dofastboot} -eq 1; then " \
                "echo Boot fastboot requested, resetting dofastboot ...;" \
                "setenv dofastboot 0; saveenv;" \
-               "echo Booting into fastboot ...; fastboot;" \
+               "echo Booting into fastboot ...; fastboot 0;" \
        "fi;" \
        "run findfdt; " \
        "run mmcboot;" \
@@ -146,6 +143,7 @@
        "setenv mmcroot /dev/mmcblk0p2 rw; " \
        "run mmcboot;" \
        ""
+#endif
 
 
 /*