From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TTpd3-0007HF-Bj for barebox@lists.infradead.org; Thu, 01 Nov 2012 07:55:57 +0000 From: Sascha Hauer Date: Thu, 1 Nov 2012 08:55:44 +0100 Message-Id: <1351756548-24640-3-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1351756548-24640-1-git-send-email-s.hauer@pengutronix.de> References: <1351756548-24640-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 2/6] ARM OMAP4 panda: switch to new environment To: barebox@lists.infradead.org Switch to new environment and add the bootscripts needed for mmc. Also, update defconfig for new environment. Signed-off-by: Sascha Hauer --- arch/arm/boards/panda/env/boot/mmc | 10 ++++++ arch/arm/boards/panda/env/config | 40 ----------------------- arch/arm/boards/panda/env/init/bootargs-base | 8 +++++ arch/arm/boards/panda/env/init/hostname | 8 +++++ arch/arm/boards/panda/env/network/eth0-discover | 5 +++ arch/arm/configs/panda_defconfig | 34 ++++++++++++++----- arch/arm/mach-omap/Kconfig | 1 + 7 files changed, 58 insertions(+), 48 deletions(-) create mode 100644 arch/arm/boards/panda/env/boot/mmc delete mode 100644 arch/arm/boards/panda/env/config create mode 100644 arch/arm/boards/panda/env/init/bootargs-base create mode 100644 arch/arm/boards/panda/env/init/hostname create mode 100644 arch/arm/boards/panda/env/network/eth0-discover diff --git a/arch/arm/boards/panda/env/boot/mmc b/arch/arm/boards/panda/env/boot/mmc new file mode 100644 index 0000000..58bd557 --- /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 1cd7eaa..0000000 --- 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/bootargs-base b/arch/arm/boards/panda/env/init/bootargs-base new file mode 100644 index 0000000..442cce3 --- /dev/null +++ b/arch/arm/boards/panda/env/init/bootargs-base @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + init-menu-add-entry "$0" "Base bootargs" + exit +fi + +global.linux.bootargs.base="console=ttyO2,115200" diff --git a/arch/arm/boards/panda/env/init/hostname b/arch/arm/boards/panda/env/init/hostname new file mode 100644 index 0000000..996c2d9 --- /dev/null +++ b/arch/arm/boards/panda/env/init/hostname @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + init-menu-add-entry "$0" "hostname" + exit +fi + +global.hostname=panda 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 0000000..77552d3 --- /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/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index 5f53ff9..7be86ac 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -1,38 +1,51 @@ CONFIG_ARCH_OMAP=y CONFIG_ARCH_OMAP4=y -CONFIG_AEABI=y +CONFIG_THUMB2_BAREBOX=y +CONFIG_CMD_ARM_MMUINFO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y +CONFIG_PBL_IMAGE=y CONFIG_MMU=y CONFIG_TEXT_BASE=0x8f000000 CONFIG_MALLOC_SIZE=0x2000000 +CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y CONFIG_PROMPT="barebox> " CONFIG_LONGHELP=y -CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y +CONFIG_MENU=y # CONFIG_TIMESTAMP is not set -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/panda/env" CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y +CONFIG_CMD_MSLEEP=y CONFIG_CMD_SAVEENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y +CONFIG_CMD_MENU=y +CONFIG_CMD_MENU_MANAGEMENT=y CONFIG_CMD_TIME=y +CONFIG_CMD_DIRNAME=y +CONFIG_CMD_LN=y +CONFIG_CMD_READLINK=y +CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y -CONFIG_CMD_LOADB=y +CONFIG_CMD_MEMINFO=y CONFIG_CMD_IOMEM=y +CONFIG_CMD_CRC=y +CONFIG_CMD_CRC_CMP=y +CONFIG_CMD_MD5SUM=y CONFIG_CMD_FLASH=y CONFIG_CMD_BOOTM_SHOW_TYPE=y CONFIG_CMD_BOOTM_VERBOSE=y CONFIG_CMD_BOOTM_INITRD=y CONFIG_CMD_BOOTM_OFTREE=y CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y -# CONFIG_CMD_BOOTZ is not set +CONFIG_CMD_UIMAGE=y # CONFIG_CMD_BOOTU is not set CONFIG_CMD_RESET=y CONFIG_CMD_GO=y @@ -44,12 +57,13 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y +CONFIG_CMD_LED_TRIGGER=y +CONFIG_CMD_MIITOOL=y CONFIG_NET=y CONFIG_NET_DHCP=y -CONFIG_NET_NFS=y CONFIG_NET_PING=y -CONFIG_CMD_TFTP=y -CONFIG_FS_TFTP=y +CONFIG_NET_NETCONSOLE=y +CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y CONFIG_NET_USB=y @@ -65,6 +79,10 @@ CONFIG_MCI_OMAP_HSMMC=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_TRIGGERS=y +CONFIG_FS_TFTP=y +CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y +CONFIG_ZLIB=y +CONFIG_LZO_DECOMPRESS=y diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index aa31633..c4a88ab 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -118,6 +118,7 @@ config MACH_PANDA bool "Texas Instrument's Panda Board" select HAVE_NOSHELL select MACH_HAS_LOWLEVEL_INIT + select HAVE_DEFAULT_ENVIRONMENT_NEW depends on ARCH_OMAP4 help Say Y here if you are using OMAP4 Panda board -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox