From 9b428f7cc481b8d45584c20b3861ff117ec62713 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 18 Oct 2012 20:08:38 +0000 Subject: [PATCH] Updated cubox with rmull's patches --- devices/cubox/Makefile | 12 ++++++------ devices/cubox/boot-mmcblk.script | 3 ++- devices/cubox/boot-ram.script | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/devices/cubox/Makefile b/devices/cubox/Makefile index 0f5a851..f532e32 100644 --- a/devices/cubox/Makefile +++ b/devices/cubox/Makefile @@ -6,7 +6,7 @@ PWD = $(shell pwd) WORK = $(PWD)/work MKIMAGE = $(PWD)/../../work/mkimage ZIMAGE = $(PWD)/../../../kernel/cubox/work/zImage -INITRDGZ = $(PWD)/../../../initrd/work/initrd.gz +INITRDGZ = $(PWD)/../../../initrd/work/initrd-hardfp.gz .PHONY: all clean distclean uImage uInitrd bootscr @@ -20,8 +20,8 @@ $(WORK): install -d $(WORK) $(WORK)/uImage: $(WORK) $(MKIMAGE) $(ZIMAGE) - $(MKIMAGE) -A arm -O linux -a 0 -e 0 \ - -T kernel -C none -n "Linux-2.6.32.9-cubox" \ + $(MKIMAGE) -A arm -O linux -a 0x1a000000 -e 0x1a000000 \ + -T kernel -C none -n "Linux-3.5.3-cubox" \ -d $(ZIMAGE) $(WORK)/uImage uImage: $(WORK)/uImage @@ -30,7 +30,7 @@ uImage-clean: rm -f $(WORK)/uImage $(WORK)/uInitrd: $(WORK) $(MKIMAGE) $(INITRDGZ) - $(MKIMAGE) -A arm -O linux -a 0x1a000000 -e 0x1a000000 \ + $(MKIMAGE) -A arm -O linux -a 0 -e 0 \ -T ramdisk -C none -n "CRUX-ARM Initrd Image" \ -d $(INITRDGZ) $(WORK)/uInitrd @@ -41,13 +41,13 @@ uInitrd-clean: $(WORK)/boot-ram.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-ram.script $(MKIMAGE) -A arm -O linux -a 0 -e 0 \ - -T script -C none -n "EfikaMX Boot Script (ram)" \ + -T script -C none -n "CuBox Boot Script (ram)" \ -d $(PWD)/boot-ram.script \ $(WORK)/boot-ram.scr $(WORK)/boot-mmcblk.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-mmcblk.script $(MKIMAGE) -A arm -O linux -a 0 -e 0 \ - -T script -C none -n "EfikaMX Boot Script (mmcblk)" \ + -T script -C none -n "CuBox Boot Script (mmcblk)" \ -d $(PWD)/boot-mmcblk.script \ $(WORK)/boot-mmcblk.scr diff --git a/devices/cubox/boot-mmcblk.script b/devices/cubox/boot-mmcblk.script index d10f28c..a398134 100644 --- a/devices/cubox/boot-mmcblk.script +++ b/devices/cubox/boot-mmcblk.script @@ -1,6 +1,7 @@ setenv kernel uImage; +setenv loadcmd ext2load mmc 0:1 setenv kerneladdr 0x16000000; -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootdelay=10 ro; +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 ro rootwait vmalloc=384M video=dovefb:lcd0:1920x1080-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0; ${loadcmd} ${kerneladdr} ${kernel} if imi ${kerneladdr}; then bootm ${kerneladdr} diff --git a/devices/cubox/boot-ram.script b/devices/cubox/boot-ram.script index 2974b57..07ff307 100644 --- a/devices/cubox/boot-ram.script +++ b/devices/cubox/boot-ram.script @@ -1,8 +1,9 @@ +setenv loadcmd ext2load usb 0:1; setenv ramdisk uInitrd; setenv ramdiskaddr 0x18000000; setenv kernel uImage; setenv kerneladdr 0x16000000; -setenv bootargs console=ttyS0,115200 root=/dev/ram0 rootdelay=10 ro; +setenv bootargs console=ttyS0,115200 root=/dev/ram0 ro rootwait vmalloc=384M video=dovefb:lcd0:1920x1080-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0; ${loadcmd} ${ramdiskaddr} ${ramdisk}; if imi ${ramdiskaddr}; then; else setenv bootargs ${bootargs} noinitrd; -- 2.26.2