Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / include / configs / bk4r1.h

diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index bbd3e4e..c377094 100644 (file)
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -37,7 +37,6 @@
                        "run manage_userdata; "
 
 /* Enable PREBOOT variable */
-#define CONFIG_PREBOOT
 
 /* Set ARP_TIMEOUT to 500ms */
 #define CONFIG_ARP_TIMEOUT 500UL
@@ -58,28 +57,10 @@
                                                "saveenv; " \
                                                "fi; "
 
-/* Autoboot options */
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT \
-       "Enter passphrase to stop autoboot, booting in %d seconds\n"
-#define CONFIG_AUTOBOOT_STOP_STR "123"
-
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/* Enable passing of ATAGs */
-#define CONFIG_CMDLINE_TAG
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 4 * SZ_1M)
-
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* NAND support */
-#define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE 1
 
 #define IMX_FEC1_BASE                  ENET1_BASE_ADDR
@@ -91,8 +72,6 @@
 #define CONFIG_SYS_FSL_QSPI_LE
 #endif
 
-#define CONFIG_LOADADDR        0x82000000
-
 /* We boot from the gfxRAM area of the OCRAM. */
 #define CONFIG_BOARD_SIZE_LIMIT                520192
 
@@ -189,15 +168,57 @@
                "ubi part system; " \
                "ubi write ${sys_addr} rootfs${active_workset} ${filesize}; " \
                "ubi detach; fi\0" \
+       "setup_dtbkernel=nand erase.part dtbkernel; " \
+               "ubi part dtbkernel; " \
+               "ubi create dtbkernel1 972000 s; " \
+               "ubi create dtbkernel2 972000 s; " \
+               "ubi detach\0" \
+       "setup_system=nand erase.part system; " \
+               "ubi part system; " \
+               "ubi create rootfs1 15E15000 d; " \
+               "ubi create rootfs2 15E15000 d; " \
+               "ubi create userdata; " \
+               "ubi detach\0" \
+       "setup_nor1=" BK4_NET_INIT \
+               "if tftp ${sys_addr} ${tftpdir}ubinor1.img; " \
+               "then sf probe 0:0; " \
+               "sf erase 0 01000000; " \
+               "mtdparts default; " \
+               "ubi part nor; " \
+               "ubi create nor1fs; " \
+               "ubi write ${sys_addr} nor1fs ${filesize}; " \
+               "ubi detach; fi\0" \
+       "setup_nor2=" BK4_NET_INIT \
+               "if tftp ${sys_addr} ${tftpdir}ubinor2.img; " \
+               "then sf probe 0:1; " \
+               "sf erase 0 01000000; " \
+               "mtdparts default; " \
+               "ubi part nor; " \
+               "ubi create nor2fs; " \
+               "ubi write ${sys_addr} nor2fs ${filesize}; " \
+               "ubi detach; fi\0" \
+       "prepare_install_bk4r1_envs=" \
+               "echo 'Preparing envs for SD card recovery!';" \
+               "setenv ipaddr 192.168.0.99;" \
+               "setenv serverip 192.168.0.50;" \
+               "\0" \
+       "install_bk4r1rs="\
+               "led 0 on; " \
+               "nand erase.chip; mtdparts default; "\
+               "led 1 on; "\
+               "run setup_dtbkernel; " \
+               "run setup_system; " \
+               "led 2 on;" \
+               "run update_bootloader_from_sd; "\
+               "run update_dtbkernel_from_sd; "\
+               "run update_rootfs_from_sd; "\
+               "setenv bootcmd 'run bootcmd_nand'; "\
+               "saveenv; " \
+               "led 3 on; " \
+               "echo Finished - Please Power off, REMOVE SDCARD and set boot" \
+                       "source to NAND\0" \
        "active_workset=1\0"
 
-/* Miscellaneous configurable options */
-
-#define CONFIG_SYS_MEMTEST_START       0x80010000
-#define CONFIG_SYS_MEMTEST_END         0x87C00000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical memory map */
 #define PHYS_SDRAM                     (0x80000000)
 #define PHYS_SDRAM_SIZE                (SZ_512M)
@@ -211,12 +232,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#ifdef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_SECT_SIZE   (SZ_128K)
-#define CONFIG_ENV_SIZE                (SZ_8K)
-#define CONFIG_ENV_OFFSET      0x200000
-#define CONFIG_ENV_SIZE_REDUND (SZ_8K)
-#define CONFIG_ENV_OFFSET_REDUND       0x220000
-#endif
-
 #endif /* __CONFIG_H */