diff options
Diffstat (limited to 'arch/arm/boards')
| -rw-r--r-- | arch/arm/boards/beagle/board.c | 3 | ||||
| -rw-r--r-- | arch/arm/boards/beagle/env/boot/mmc | 10 | ||||
| -rw-r--r-- | arch/arm/boards/beagle/env/init/config-board | 7 | ||||
| -rw-r--r-- | arch/arm/boards/beagle/env/network/eth0-discover | 5 | ||||
| -rw-r--r-- | arch/arm/boards/omap343xdsp/board.c | 3 | ||||
| -rw-r--r-- | arch/arm/boards/panda/env/boot/mmc | 10 | ||||
| -rw-r--r-- | arch/arm/boards/panda/env/config | 40 | ||||
| -rw-r--r-- | arch/arm/boards/panda/env/init/config-board | 7 | ||||
| -rw-r--r-- | arch/arm/boards/panda/env/network/eth0-discover | 5 | ||||
| -rw-r--r-- | arch/arm/boards/phycard-a-l1/pca-a-l1.c | 3 |
10 files changed, 50 insertions, 43 deletions
diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c index 19bf740ad2..ec26528cdd 100644 --- a/arch/arm/boards/beagle/board.c +++ b/arch/arm/boards/beagle/board.c @@ -220,7 +220,8 @@ static int beagle_board_init(void) { int in_sdram = running_in_sdram(); - omap3_core_init(); + if (!in_sdram) + omap3_core_init(); mux_config(); /* Dont reconfigure SDRAM while running in SDRAM! */ diff --git a/arch/arm/boards/beagle/env/boot/mmc b/arch/arm/boards/beagle/env/boot/mmc new file mode 100644 index 0000000000..58bd55742c --- /dev/null +++ b/arch/arm/boards/beagle/env/boot/mmc @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + boot-menu-add-entry "$0" "MMC (ext3)" + exit +fi + +global.bootm.image="/boot/zImage" +#global.bootm.oftree="/boot/oftree" +global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait" diff --git a/arch/arm/boards/beagle/env/init/config-board b/arch/arm/boards/beagle/env/init/config-board new file mode 100644 index 0000000000..cc0820a089 --- /dev/null +++ b/arch/arm/boards/beagle/env/init/config-board @@ -0,0 +1,7 @@ +#!/bin/sh + +# board defaults, do not change in running system. Change /env/config +# instead + +global.hostname=beagle +global.linux.bootargs.base="console=ttyO2,115200" diff --git a/arch/arm/boards/beagle/env/network/eth0-discover b/arch/arm/boards/beagle/env/network/eth0-discover new file mode 100644 index 0000000000..86d13f5c43 --- /dev/null +++ b/arch/arm/boards/beagle/env/network/eth0-discover @@ -0,0 +1,5 @@ +#!/bin/sh + +# The beagle board supports a network adapter on USB + +usb diff --git a/arch/arm/boards/omap343xdsp/board.c b/arch/arm/boards/omap343xdsp/board.c index 2343dc03ff..692cf9ac44 100644 --- a/arch/arm/boards/omap343xdsp/board.c +++ b/arch/arm/boards/omap343xdsp/board.c @@ -76,7 +76,8 @@ static int sdp343x_board_init(void) { int in_sdram = running_in_sdram(); - omap3_core_init(); + if (!in_sdram) + omap3_core_init(); mux_config(); if (!in_sdram) diff --git a/arch/arm/boards/panda/env/boot/mmc b/arch/arm/boards/panda/env/boot/mmc new file mode 100644 index 0000000000..58bd55742c --- /dev/null +++ b/arch/arm/boards/panda/env/boot/mmc @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + boot-menu-add-entry "$0" "MMC (ext3)" + exit +fi + +global.bootm.image="/boot/zImage" +#global.bootm.oftree="/boot/oftree" +global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait" diff --git a/arch/arm/boards/panda/env/config b/arch/arm/boards/panda/env/config deleted file mode 100644 index 1cd7eaa352..0000000000 --- a/arch/arm/boards/panda/env/config +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -global.hostname=panda -user= - -# use 'dhcp' to do dhcp in barebox and in kernel -# use 'none' if you want to skip kernel ip autoconfiguration -ip=dhcp - -# or set your networking parameters here -#eth0.ipaddr=a.b.c.d -#eth0.netmask=a.b.c.d -#eth0.gateway=a.b.c.d -#eth0.serverip=a.b.c.d - -# can be either 'nfs', 'tftp', 'nor' or 'nand' -kernel_loc=tftp -# can be either 'net', 'nor', 'nand' or 'initrd' -rootfs_loc=net - -kernelimage=zImage-${global.hostname} -#kernelimage=uImage-${global.hostname} -#kernelimage=Image-${global.hostname} -#kernelimage=Image-${global.hostname}.lzo - -if [ -n $user ]; then - kernelimage="$user"-"$kernelimage" - nfsroot="$eth0.serverip:/home/$user/nfsroot/${global.hostname}" - rootfsimage="$user"-"$rootfsimage" -else - nfsroot="$eth0.serverip:/path/to/nfs/root" -fi - -autoboot_timeout=3 - -bootargs="console=ttyO2,115200" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m " - diff --git a/arch/arm/boards/panda/env/init/config-board b/arch/arm/boards/panda/env/init/config-board new file mode 100644 index 0000000000..27e7339658 --- /dev/null +++ b/arch/arm/boards/panda/env/init/config-board @@ -0,0 +1,7 @@ +#!/bin/sh + +# board defaults, do not change in running system. Change /env/config +# instead + +global.hostname=panda +global.linux.bootargs.base="console=ttyO2,115200" diff --git a/arch/arm/boards/panda/env/network/eth0-discover b/arch/arm/boards/panda/env/network/eth0-discover new file mode 100644 index 0000000000..77552d30b3 --- /dev/null +++ b/arch/arm/boards/panda/env/network/eth0-discover @@ -0,0 +1,5 @@ +#!/bin/sh + +# Panda has a network adapter on USB + +usb diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c index f2d10f2e6e..6652242114 100644 --- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c +++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c @@ -297,7 +297,8 @@ static int pcaal1_board_init(void) { int in_sdram = running_in_sdram(); - omap3_core_init(); + if (!in_sdram) + omap3_core_init(); pcaal1_mux_config(); /* Dont reconfigure SDRAM while running in SDRAM! */ |