Author: myles
Date: 2009-11-13 00:08:34 +0100 (Fri, 13 Nov 2009)
New Revision: 277
Modified:
buildrom-devel/config/payloads/Config.in
buildrom-devel/config/payloads/kernel.conf
buildrom-devel/config/payloads/lab.conf
buildrom-devel/packages/kernel/kernel.inc
buildrom-devel/scripts/Makefile.kernel
buildrom-devel/scripts/Makefile.lab
Log:
Clean up command line for LAB. Add kernel-refresh target.
Signed-off-by: Myles Watson <myle...@gmail.com>
Acked-by: Myles Watson <myle...@gmail.com>
Modified: buildrom-devel/config/payloads/Config.in
===================================================================
--- buildrom-devel/config/payloads/Config.in 2009-09-25 19:55:13 UTC (rev
276)
+++ buildrom-devel/config/payloads/Config.in 2009-11-12 23:08:34 UTC (rev
277)
@@ -143,6 +143,12 @@
help
Say 'Y' here to include the busybox tools
+config LAB_CMDLINE
+ string "Kernel command line for LAB"
+ default "console=tty0 earlyprintk=serial,ttyS0,115200,keep
rdinit=/linuxrc"
+ help
+ Specify the kernel command line to use for the kernel. This is
+ passed to mkelfimage when the kernel is built.
endmenu
menu "Memtest86 Configuration"
Modified: buildrom-devel/config/payloads/kernel.conf
===================================================================
--- buildrom-devel/config/payloads/kernel.conf 2009-09-25 19:55:13 UTC (rev
276)
+++ buildrom-devel/config/payloads/kernel.conf 2009-11-12 23:08:34 UTC (rev
277)
@@ -4,10 +4,6 @@
PAYLOAD_BUILD=scripts/Makefile.kernel
-### Payload specific configuration
-
-COMMAND_LINE=$(CONFIG_CMDLINE)
-
###########################################
# You shouldn't change anything under this point
###########################################
Modified: buildrom-devel/config/payloads/lab.conf
===================================================================
--- buildrom-devel/config/payloads/lab.conf 2009-09-25 19:55:13 UTC (rev
276)
+++ buildrom-devel/config/payloads/lab.conf 2009-11-12 23:08:34 UTC (rev
277)
@@ -6,9 +6,6 @@
### Payload specific configuration
-# Specify the default command line for the image
-COMMAND_LINE=console=tty0 console=ttyS0,115200 rdinit=/linuxrc
-
# This is the version string printed during boot.
ifeq ($(CONFIG_PLATFORM_OLPC),y)
Modified: buildrom-devel/packages/kernel/kernel.inc
===================================================================
--- buildrom-devel/packages/kernel/kernel.inc 2009-09-25 19:55:13 UTC (rev
276)
+++ buildrom-devel/packages/kernel/kernel.inc 2009-11-12 23:08:34 UTC (rev
277)
@@ -87,6 +87,11 @@
generic-kernel: $(OUTPUT_DIR)/bzImage $(OUTPUT_DIR)/vmlinux
$(KERNEL_STAMP_DIR)/.headers
+kernel-refresh:
+ @ echo "Refreshing kernel..."
+ @ touch $(KERNEL_SRC_DIR)/.config
+ @ $(MAKE) payload
+
generic-kernel-clean:
@ echo "Cleaning kernel..."
@ rm -f $(KERNEL_STAMP_DIR)/.headers
Modified: buildrom-devel/scripts/Makefile.kernel
===================================================================
--- buildrom-devel/scripts/Makefile.kernel 2009-09-25 19:55:13 UTC (rev
276)
+++ buildrom-devel/scripts/Makefile.kernel 2009-11-12 23:08:34 UTC (rev
277)
@@ -4,7 +4,7 @@
@ echo "Building the ELF payload..."
@ rm -f $@
@ $(STAGING_DIR)/sbin/mkelfImage --type bzImage-i386 \
- --command-line=$(COMMAND_LINE) $(OUTPUT_DIR)/bzImage $@
+ --command-line=$(CONFIG_CMDLINE) $(OUTPUT_DIR)/bzImage $@
@ chmod 0644 $@
$(OUTPUT_DIR)/kernel-payload.elf.lzma: $(OUTPUT_DIR)/kernel-payload.elf
Modified: buildrom-devel/scripts/Makefile.lab
===================================================================
--- buildrom-devel/scripts/Makefile.lab 2009-09-25 19:55:13 UTC (rev 276)
+++ buildrom-devel/scripts/Makefile.lab 2009-11-12 23:08:34 UTC (rev 277)
@@ -7,21 +7,21 @@
@ echo "Cleaning up shared libraries..."
- find $(INITRD_DIR) -type f -perm +100 -exec file -rNF '' {} \; | \
+ @ find $(INITRD_DIR) -type f -perm +100 -exec file -rNF '' {} \; | \
awk ' /executable.*dynamically/ { print $$1}' > $(INITRD_DIR)/.list
- (cd $(INITRD_DIR); export CFLAGS="$(CROSS_CFLAGS)"; \
+ @ (cd $(INITRD_DIR); export CFLAGS="$(CROSS_CFLAGS)"; \
python $(BIN_DIR)/mklibs.py \
--root $(STAGING_DIR) -d ./ `cat $(INITRD_DIR)/.list` > /dev/null)
- rm -f $(INITRD_DIR)/.list
+ @ rm -f $(INITRD_DIR)/.list
- echo "BUILDROM LAB $(ROM_VERSION)" > $(INITRD_DIR)/buildrom-version
- echo -n "Build timestamp: " >> $(INITRD_DIR)/buildrom-version
- date "+%Y%m%d %H:%M:%S" >> $(INITRD_DIR)/buildrom-version
+ @ echo "BUILDROM LAB $(ROM_VERSION)" > $(INITRD_DIR)/buildrom-version
+ @ echo -n "Build timestamp: " >> $(INITRD_DIR)/buildrom-version
+ @ date "+%Y%m%d %H:%M:%S" >> $(INITRD_DIR)/buildrom-version
- echo "Building the initrd..."
- install -d $(OUTPUT_DIR)
- cd $(INITRD_DIR); find . | cpio -o -H newc 2> /dev/null > $@
+ @ echo "Building the initrd..."
+ @ install -d $(OUTPUT_DIR)
+ @ cd $(INITRD_DIR); find . | cpio -o -H newc 2> /dev/null > $@
$(OUTPUT_DIR)/initrd: $(OUTPUT_DIR)/initrd.uncompressed
@ gzip -9 -c -n $< > $@
@@ -29,7 +29,7 @@
$(OUTPUT_DIR)/lab-payload-uncompressed.elf: $(OUTPUT_DIR)/initrd.uncompressed
@ echo "Building the uncompressed ELF payload..."
@ rm -f $@
- @ $(STAGING_DIR)/sbin/mkelfImage --command-line="$(COMMAND_LINE)" \
+ @ $(STAGING_DIR)/sbin/mkelfImage --command-line=$(CONFIG_LAB_CMDLINE) \
--ramdisk=$(OUTPUT_DIR)/initrd.uncompressed \
$(OUTPUT_DIR)/vmlinux $@
@ chmod 0644 $@
@@ -37,7 +37,7 @@
$(OUTPUT_DIR)/lab-payload.elf: $(OUTPUT_DIR)/initrd
@ echo "Building the ELF payload..."
@ rm -f $@
- @ $(STAGING_DIR)/sbin/mkelfImage --command-line="$(COMMAND_LINE)" \
+ @ $(STAGING_DIR)/sbin/mkelfImage --command-line=$(CONFIG_LAB_CMDLINE) \
--ramdisk=$(OUTPUT_DIR)/initrd $(OUTPUT_DIR)/vmlinux $@
@ chmod 0644 $@
@ $(BIN_DIR)/checkrom.sh $@
--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
