CRUX-ARM :
Home
Home
::
Documentation
::
Download
::
Development
::
Community
::
Ports
::
Packages
::
Bugs
::
Links
::
About
::
Donors
development
/
bootloader.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b253990
)
Added console option by template. Updated scripts with this template and last Efikamx...
author
Victor Martinez
<pitillo@ono.com>
Thu, 18 Oct 2012 18:57:51 +0000
(18:57 +0000)
committer
Victor Martinez
<pitillo@ono.com>
Thu, 18 Oct 2012 18:57:51 +0000
(18:57 +0000)
devices/efikamx/Makefile
patch
|
blob
|
blame
|
history
devices/efikamx/boot-mmc.script
patch
|
blob
|
blame
|
history
devices/efikamx/boot-ramdisk.script
patch
|
blob
|
blame
|
history
devices/efikamx/boot-sda.script
patch
|
blob
|
blame
|
history
diff --git
a/devices/efikamx/Makefile
b/devices/efikamx/Makefile
index fdbb545d724da725e30b716bfeb2ea1b8da12992..ef821580e486ea918da9a68f5b6d6468fb1e354a 100644
(file)
--- a/
devices/efikamx/Makefile
+++ b/
devices/efikamx/Makefile
@@
-11,6
+11,8
@@
INITRAMFS = $(PWD)/../../../initramfs/work/initramfs
RAMDISK_TYPE = uInitrd # select between uInitramfs or uInitrd
RAMDISK_TYPE = uInitrd # select between uInitramfs or uInitrd
+CONSOLE = tty0 # tty0 / ttymxc0,115200
+
.PHONY: all clean distclean kernel ramdisk bootscr
all: kernel ramdisk bootscr
.PHONY: all clean distclean kernel ramdisk bootscr
all: kernel ramdisk bootscr
@@
-24,7
+26,7
@@
$(WORK):
$(WORK)/uImage: $(WORK) $(MKIMAGE) $(ZIMAGE)
$(MKIMAGE) -A arm -O linux -a 0x90008000 -e 0x90008000 \
$(WORK)/uImage: $(WORK) $(MKIMAGE) $(ZIMAGE)
$(MKIMAGE) -A arm -O linux -a 0x90008000 -e 0x90008000 \
- -T kernel -C none -n "Linux-2.6.31.14.2
2
-efikamx" \
+ -T kernel -C none -n "Linux-2.6.31.14.2
7
-efikamx" \
-d $(ZIMAGE) $(WORK)/uImage
kernel: $(WORK)/uImage
-d $(ZIMAGE) $(WORK)/uImage
kernel: $(WORK)/uImage
diff --git
a/devices/efikamx/boot-mmc.script
b/devices/efikamx/boot-mmc.script
index 00a381077be5ae158f60976756094113ffdda0e6..7f60ee3f15c937b0f3266fc4ff09e9993e751fcb 100644
(file)
--- a/
devices/efikamx/boot-mmc.script
+++ b/
devices/efikamx/boot-mmc.script
@@
-1,5
+1,5
@@
setenv kernel uImage;
setenv kernel uImage;
-setenv bootargs console=
ttymxc0,115200 root=/dev/mmcblk0p2 console=tty1
rootwait ro;
+setenv bootargs console=
#CONSOLE# root=/dev/mmcblk0p2
rootwait ro;
${loadcmd} ${kerneladdr} ${kernel}
if imi ${kerneladdr}; then
bootm ${kerneladdr}
${loadcmd} ${kerneladdr} ${kernel}
if imi ${kerneladdr}; then
bootm ${kerneladdr}
diff --git
a/devices/efikamx/boot-ramdisk.script
b/devices/efikamx/boot-ramdisk.script
index a7f17498727663bcf8916cc81bc00de79e1c243d..a7351cbe62903b19a44c43630b047abbaa54d8e9 100644
(file)
--- a/
devices/efikamx/boot-ramdisk.script
+++ b/
devices/efikamx/boot-ramdisk.script
@@
-1,6
+1,6
@@
setenv ramdisk #RAMDISK_TYPE#;
setenv kernel uImage;
setenv ramdisk #RAMDISK_TYPE#;
setenv kernel uImage;
-setenv bootargs console=
ttymxc0,115200 root=/dev/ram0 console=tty1
rootwait ro;
+setenv bootargs console=
#CONSOLE# root=/dev/ram0
rootwait ro;
${loadcmd} ${ramdiskaddr} ${ramdisk};
if imi ${ramdiskaddr}; then; else
setenv bootargs ${bootargs} noinitrd;
${loadcmd} ${ramdiskaddr} ${ramdisk};
if imi ${ramdiskaddr}; then; else
setenv bootargs ${bootargs} noinitrd;
diff --git
a/devices/efikamx/boot-sda.script
b/devices/efikamx/boot-sda.script
index 0753d6968f1b52e855bc3cac809ddec011576e57..019a1da210832565e35f1058ef58982ac68021c5 100644
(file)
--- a/
devices/efikamx/boot-sda.script
+++ b/
devices/efikamx/boot-sda.script
@@
-1,5
+1,5
@@
setenv kernel uImage;
setenv kernel uImage;
-setenv bootargs console=
ttymxc0,115200 root=/dev/sda1 console=tty
1 rootwait ro;
+setenv bootargs console=
#CONSOLE# root=/dev/sda
1 rootwait ro;
${loadcmd} ${kerneladdr} ${kernel}
if imi ${kerneladdr}; then
bootm ${kerneladdr}
${loadcmd} ${kerneladdr} ${kernel}
if imi ${kerneladdr}; then
bootm ${kerneladdr}