diff options
Diffstat (limited to '0004-convert-omap4-boards-over-to-distro-configs.patch')
| -rw-r--r-- | 0004-convert-omap4-boards-over-to-distro-configs.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/0004-convert-omap4-boards-over-to-distro-configs.patch b/0004-convert-omap4-boards-over-to-distro-configs.patch new file mode 100644 index 0000000..3ccc447 --- /dev/null +++ b/0004-convert-omap4-boards-over-to-distro-configs.patch @@ -0,0 +1,106 @@ +From 1bab90af7e0c00bf5aa4718b864cac767cd34c18 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore <dennis@ausil.us> +Date: Wed, 12 Mar 2014 14:40:35 -0500 +Subject: [PATCH 4/4] convert omap4 boards over to distro configs + +--- + include/configs/omap4_panda.h | 3 --- + include/configs/ti_omap4_common.h | 44 +++++++++++++-------------------------- + 2 files changed, 15 insertions(+), 32 deletions(-) + +diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h +index 7378acd..26f7aee 100644 +--- a/include/configs/omap4_panda.h ++++ b/include/configs/omap4_panda.h +@@ -33,11 +33,8 @@ + + #define CONFIG_UBOOT_ENABLE_PADS_ALL + +-#define CONFIG_CMD_PING +-#define CONFIG_CMD_DHCP + + #include <configs/ti_omap4_common.h> +-#define CONFIG_CMD_NET + + /* GPIO */ + #define CONFIG_CMD_GPIO +diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h +index bcb5eab..69af58b 100644 +--- a/include/configs/ti_omap4_common.h ++++ b/include/configs/ti_omap4_common.h +@@ -87,10 +87,14 @@ + * Environment setup + */ + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "loadaddr=0x82000000\0" \ ++ "kernel_addr_r=0x82000000\0" \ + "console=ttyO2,115200n8\0" \ +- "fdt_high=0xffffffff\0" \ +- "fdtaddr=0x80f80000\0" \ ++ "fdt_high=0xA0000000\0" \ ++ "kernel_addr_r=0x81000000\0" \ ++ "scriptaddr=0x87E00000\0" \ ++ "pxe_addr_r=0x87F00000\0" \ ++ "fdt_addr_r=0x88000000\0" \ ++ "ramdisk_addr_r=0x88100000\0" \ + "fdtfile=undefined\0" \ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ +@@ -104,16 +108,16 @@ + "vram=${vram} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ +- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ ++ "loadbootscript=load mmc ${mmcdev} ${kernel_addr_r} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ +- "source ${loadaddr}\0" \ +- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ ++ "source ${kernel_addr_r}\0" \ ++ "loadbootenv=load mmc ${mmcdev} ${kernel_addr_r} uEnv.txt\0" \ + "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ +- "env import -t ${loadaddr} ${filesize}\0" \ +- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "env import -t ${kernel_addr_r} ${filesize}\0" \ ++ "loadimage=load mmc ${bootpart} ${kernel_addr_r} ${bootdir}/${bootfile}\0" \ + "mmcboot=echo Booting from mmc${mmcdev} ...; " \ + "run mmcargs; " \ +- "bootz ${loadaddr} - ${fdtaddr}\0" \ ++ "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "findfdt="\ + "if test $board_name = sdp4430; then " \ + "setenv fdtfile omap4-sdp.dtb; fi; " \ +@@ -125,29 +129,11 @@ + "setenv fdtfile omap4-panda-es.dtb; fi;" \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0" \ +- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ ++ "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \ + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "mmc dev ${mmcdev}; if mmc rescan; then " \ +- "echo SD/MMC found on device ${mmcdev};" \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadbootenv; then " \ +- "run importbootenv; " \ +- "fi;" \ +- "if test -n ${uenvcmd}; then " \ +- "echo Running uenvcmd ...;" \ +- "run uenvcmd;" \ +- "fi;" \ +- "fi;" \ +- "if run loadimage; then " \ +- "run loadfdt;" \ +- "run mmcboot; " \ +- "fi; " \ +- "fi" +- ++ for target in ${boot_targets}; do run bootcmd_${target}; done + /* + * Defines for SPL + * It is known that this will break HS devices. Since the current size of +-- +1.9.0 + |