From 39e31bdde0092c8f6e85803ab8680aacf7c82b51 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jan 2013 12:52:28 -0600 Subject: [PATCH] am335x: add some devices for v3.8-rc5, and rework the am335x firmware Signed-off-by: Robert Nelson --- hwpack/am335x-bone.conf | 16 +++++++------- hwpack/am335x-bonelt.conf | 44 +++++++++++++++++++++++++++++++++++++++ hwpack/am335x-evmsk.conf | 44 +++++++++++++++++++++++++++++++++++++++ hwpack/docs.txt | 30 +++++++++++++++++++++----- mk_mmc.sh | 17 ++++++++++++--- 5 files changed, 136 insertions(+), 15 deletions(-) create mode 100644 hwpack/am335x-bonelt.conf create mode 100644 hwpack/am335x-evmsk.conf diff --git a/hwpack/am335x-bone.conf b/hwpack/am335x-bone.conf index 386ec56..9427fd3 100644 --- a/hwpack/am335x-bone.conf +++ b/hwpack/am335x-bone.conf @@ -1,39 +1,41 @@ #!/bin/bash -#Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7 -# --dtb am335x-bone (BeagleBone (v3.7.x):supported) +#http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5 +# --dtb am335x-bone (BeagleBone (v3.8.x)) board="BEAGLEBONE_A" -SYSTEM="bone_dtb" - -#Bootloader: http://rcn-ee.net/deb/tools/latest/bootloader-ng -#ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1 -#ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img +#Bootloader: bootloader_http="http://rcn-ee.net/deb/tools/latest/" bootloader_latest_file="bootloader-ng" +#Bootloader Partition: bootloader_location="fatfs_boot" boot_partition_size="64" spl_name="MLO" boot_name="u-boot.img" +#Bootloader: u-boot settings boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="loaduimage" uboot_CMD_LOAD="fatload" +#Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp kernel_subarch="omap-psp" kernel_repo="TESTING" usbnet_mem= +#Kernel: Bootloader Settings: kernel_addr="0x80300000" initrd_addr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" +need_dtbs=1 +need_am335x_firmware=1 SERIAL="ttyO0" SERIAL_CONSOLE="${SERIAL},115200n8" diff --git a/hwpack/am335x-bonelt.conf b/hwpack/am335x-bonelt.conf new file mode 100644 index 0000000..c8c7c78 --- /dev/null +++ b/hwpack/am335x-bonelt.conf @@ -0,0 +1,44 @@ +#!/bin/bash +#http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5 +# --dtb am335x-bone (BeagleBone (v3.8.x)) + +board="BEAGLEBONE_A" + +#Bootloader: +bootloader_http="http://rcn-ee.net/deb/tools/latest/" +bootloader_latest_file="bootloader-ng" + +#Bootloader Partition: +bootloader_location="fatfs_boot" +boot_partition_size="64" +spl_name="MLO" +boot_name="u-boot.img" + +#Bootloader: u-boot settings +boot_image="bootz" +boot_script="uEnv.txt" +boot_fstype="fat" +uboot_SCRIPT_ENTRY="loaduimage" +uboot_CMD_LOAD="fatload" + +#Kernel: +#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp +kernel_subarch="omap-psp" +kernel_repo="TESTING" + +usbnet_mem= + +#Kernel: Bootloader Settings: +kernel_addr="0x80300000" +initrd_addr="0x81600000" +load_addr="0x80008000" +dtb_addr="0x815f0000" +dtb_file="am335x-bonelt.dtb" +need_dtbs=1 +need_am335x_firmware=1 + +SERIAL="ttyO0" +SERIAL_CONSOLE="${SERIAL},115200n8" + +SERIAL_MODE=1 +USE_KMS=1 diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf new file mode 100644 index 0000000..78a0fac --- /dev/null +++ b/hwpack/am335x-evmsk.conf @@ -0,0 +1,44 @@ +#!/bin/bash +#http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5 +# --dtb am335x-evmsk (AM335X EVM-SK (v3.8.x)) + +board="BEAGLEBONE_A" + +#Bootloader: +bootloader_http="http://rcn-ee.net/deb/tools/latest/" +bootloader_latest_file="bootloader-ng" + +#Bootloader Partition: +bootloader_location="fatfs_boot" +boot_partition_size="64" +spl_name="MLO" +boot_name="u-boot.img" + +#Bootloader: u-boot settings +boot_image="bootz" +boot_script="uEnv.txt" +boot_fstype="fat" +uboot_SCRIPT_ENTRY="loaduimage" +uboot_CMD_LOAD="fatload" + +#Kernel: +#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp +kernel_subarch="omap-psp" +kernel_repo="TESTING" + +usbnet_mem= + +#Kernel: Bootloader Settings: +kernel_addr="0x80300000" +initrd_addr="0x81600000" +load_addr="0x80008000" +dtb_addr="0x815f0000" +dtb_file="am335x-evmsk.dtb" +need_dtbs=1 +need_am335x_firmware=1 + +SERIAL="ttyO0" +SERIAL_CONSOLE="${SERIAL},115200n8" + +SERIAL_MODE=1 +USE_KMS=1 diff --git a/hwpack/docs.txt b/hwpack/docs.txt index 5b332e4..5674f8c 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -4,34 +4,41 @@ So, the plan for .conf.. Ignore [] seperaters when creating your own *.c [For the Beagle xM in v3.7: omap3-beagle-xm.dts, so file will be "omap3-beagle-xm.conf"] #!/bin/bash -#Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7 -# --dtb omap3-beagle-xm (BeagleBoard xM:supported) +#http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5 +# --dtb am335x-bone (BeagleBone (v3.8.x)) + +board="BEAGLEBONE_A" [(2) Bootloader TI/OMAP] -[FIXME: website address, should be defined as a variable...] [For the xM: http://rcn-ee.net/deb/tools/latest/bootloader-ng ] [format of file:] [ABI2:BEAGLEBOARD_XM:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1] [ABI2:BEAGLEBOARD_XM:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img] -#Bootloader: http://rcn-ee.net/deb/tools/latest/bootloader-ng -board="BEAGLEBOARD_XM" +#Bootloader: +bootloader_http="http://rcn-ee.net/deb/tools/latest/" +bootloader_latest_file="bootloader-ng" [(3) Partition Setup] [omap and a mainline u-boot] +#Bootloader Partition: bootloader_location="fatfs_boot" boot_partition_size="64" spl_name="MLO" boot_name="u-boot.img" +#Bootloader: u-boot settings boot_image="bootz" boot_script="uEnv.txt" boot_fstype="fat" +uboot_SCRIPT_ENTRY="loaduimage" +uboot_CMD_LOAD="fatload" [(3) Partition Setup] [imx and a mainline u-boot] +#Bootloader Partition: bootloader_location="dd_uboot_boot" dd_uboot_seek="1" dd_uboot_bs="1024" @@ -40,21 +47,34 @@ boot_startmb="2" unset spl_name boot_name="u-boot.imx" +#Bootloader: u-boot settings boot_image="bootz" boot_script="uEnv.txt" boot_fstype="ext2" +uboot_SCRIPT_ENTRY="loaduimage" +uboot_CMD_LOAD="ext2load" [(4) Kernel Setup] +[Raw Deb file or:] +[ABI:1 STABLE http://rcn-ee.net/deb/wheezy-armhf/v3.7.4-x8/install-me.sh] +[ABI:1 EXPERIMENTAL http://rcn-ee.net/deb/wheezy-armhf/v3.8.0-rc4-d0/install-me.sh] +[ABI:1 TESTING http://rcn-ee.net/deb/wheezy-armhf/v3.8.0-rc5-d1/install-me.sh] +#Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp kernel_subarch="omap-psp" kernel_repo="TESTING" +#Kernel: Bootloader Settings: kernel_addr="0x80300000" initrd_addr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" +need_dtbs=1 +need_am335x_firmware=1 +SERIAL="ttyO0" +SERIAL_CONSOLE="${SERIAL},115200n8" [more to come...] diff --git a/mk_mmc.sh b/mk_mmc.sh index 9cad0c7..a29a73a 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -459,6 +459,15 @@ function boot_uenv_txt_template { expansion_args=setenv expansion ip=\${ip_method} __EOF__ ;; + *) + cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ + expansion_args=setenv expansion + __EOF__ + + cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ + expansion_args=setenv expansion + __EOF__ + ;; esac if [ ! "${need_dtbs}" ] ; then @@ -714,15 +723,16 @@ function dl_device_firmware { cp -r "${DIR}/dl/linux-firmware/ti-connectivity" ${TEMPDIR}/firmware/ ${DL_WGET}ti-connectivity http://rcn-ee.net/firmware/ti/7.6.15_ble/WL1271L_BLE_Enabled_BTS_File/115K/TIInit_7.6.15.bts ;; - bone|bone_dtb) + esac + + if [ "${need_am335x_firmware}" ] ; then dl_am335_firmware echo "-----------------------------" echo "Adding pre-built Firmware for am335x powermanagment" echo "SRC: http://arago-project.org/git/projects/?p=am33x-cm3.git;a=summary" echo "-----------------------------" cp -v "${DIR}/dl/am33x-cm3/bin/am335x-pm-firmware.bin" ${TEMPDIR}/firmware/ - ;; - esac + fi } function initrd_add_firmware { @@ -1451,6 +1461,7 @@ function check_uboot_type { kernel_repo="TESTING" ;; bone) + need_am335x_firmware="1" uboot_SCRIPT_ENTRY="loaduimage" uboot_CMD_LOAD="fatload" SYSTEM="bone"