Author: stepan Date: 2007-06-28 18:56:00 +0200 (Thu, 28 Jun 2007) New Revision: 14
Added: buildrom-devel/Config.in buildrom-devel/Makefile buildrom-devel/README buildrom-devel/README.signature buildrom-devel/bin/ buildrom-devel/config/ buildrom-devel/packages/ buildrom-devel/scripts/ buildrom-devel/skeleton/ Removed: buildrom-devel/buildrom/Config.in buildrom-devel/buildrom/Makefile buildrom-devel/buildrom/README buildrom-devel/buildrom/README.signature buildrom-devel/buildrom/bin/ buildrom-devel/buildrom/config/ buildrom-devel/buildrom/packages/ buildrom-devel/buildrom/scripts/ buildrom-devel/buildrom/skeleton/ Log: Remove one level of directory depth from buildrom
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Copied: buildrom-devel/Config.in (from rev 13, buildrom-devel/buildrom/Config.in) =================================================================== --- buildrom-devel/Config.in (rev 0) +++ buildrom-devel/Config.in 2007-06-28 16:56:00 UTC (rev 14) @@ -0,0 +1,69 @@ +# The base kbuild file for buildrom + +mainmenu "Buildrom Configuration" + +config HAVE_DOT_CONFIG + bool + default y + +config VERBOSE + bool "See the build output on stdout" + default n + help + See the entire build output on stdout. Otherwise, it will + be saved off in a series of logs + +config ADVANCED + bool "Enable advanced operations" + default n + help + Allow yourself to do advanced developer things + +menu "LinuxBIOS configuration" + +config USE_LZMA + bool "Enable LZMA compression" + depends !PAYLOAD_OFW + default y + help + Allow LZMA compression for the payload. This doesn't work + for OFW. + + +config LB_USE_BUILD + bool "Specify a LinuxBIOS build dir" + depends ADVANCED + default n + help + Say 'y' here to specify an existing directory to build + LinuxBIOS from - this is useful if you have local development + tree you wish to work from + +config LB_BUILDDIR + string "LinuxBIOS build directory" + depends LB_USE_BUILD + +config LB_CUSTOM_REV + bool "Override the platform LinuxBIOS revision" + depends ADVANCED && !LB_USE_BUILD + default n + help + Say 'y' here to overide the default LinuxBIOS SVN revsion + from the platform configuration + +config LB_REVISION + string "LinuxBIOS revision" + depends LB_CUSTOM_REV + +endmenu + +config PLATFORM + bool + default n + +config PAYLOAD + bool + default n + +source config/platforms/Config.in +source config/payloads/Config.in
Copied: buildrom-devel/Makefile (from rev 13, buildrom-devel/buildrom/Makefile) =================================================================== --- buildrom-devel/Makefile (rev 0) +++ buildrom-devel/Makefile 2007-06-28 16:56:00 UTC (rev 14) @@ -0,0 +1,97 @@ +BASE_DIR=$(shell pwd) + +SCRIPT_DIR=$(BASE_DIR)/scripts +KCONFIG_DIR=$(SCRIPT_DIR)/kconfig +CONFIG_DIR=$(BASE_DIR)/config + +SOURCE_DIR=$(BASE_DIR)/sources +BUILD_DIR=$(BASE_DIR)/work +INITRD_DIR=$(BASE_DIR)/initrd-rootfs +STAGING_DIR=$(BASE_DIR)/staging +SKELETON_DIR=$(BASE_DIR)/skeleton +OUTPUT_DIR=$(BASE_DIR)/deploy +PACKAGE_DIR=$(BASE_DIR)/packages +BIN_DIR=$(BASE_DIR)/bin + +ifeq (.config, $(wildcard .config)) +dot-config := 1 +else +dot-config := 0 +config-targets := 1 +endif + +ifneq ($(filter config %config,$(MAKECMDGOALS)),) +config-targets := 1 +dot-config := 0 +endif + +ifeq ($(dot-config),0) +all: .config + +.config: oldconfig + @echo "Configuration completed - type make to build your ROM" +else +-include .config + +include $(CONFIG_DIR)/platforms/platforms.conf +include $(CONFIG_DIR)/payloads/payloads.conf + +# Include the global settings and other checks +include $(SCRIPT_DIR)/Build.settings + +# Construct the list of packages we will be building + +PKGLIST = linuxbios $(PAYLOAD-y) $(HOSTTOOLS-y) + +# Construct the various targets + +PKG_clean=$(patsubst %, %-clean, $(PKGLIST)) +PKG_distclean=$(patsubst %, %-distclean, $(PKGLIST)) + +all: $(HOSTTOOLS-y) payload linuxbios + +payload: $(PAYLOAD_TARGET) + +clean: $(PKG_clean) + @ rm -rf $(INITRD_DIR) $(OUTPUT_DIR) + +distclean: $(PKG_distclean) + @ rm -rf $(OUTPUT_DIR) $(STAGING_DIR) $(INITRD_DIR) + @ rm -f $(BASE_DIR).config + +# Include the payload builder + +ifneq ($(PAYLOAD_BUILD),) +include $(PAYLOAD_BUILD) +endif + +# The following code gets all the make targets, but filters out the kernel +# targets which are implicitly set by the platform configuration + +MKTARGETS:= $(shell ls $(PACKAGE_DIR)/*/*.mk) + +include $(filter-out $(PACKAGE_DIR)/kernel/% $(PACKAGE_DIR)/linuxbios/%,$(MKTARGETS)) + +include $(KERNEL_MK) $(LINUXBIOS_MK) + +endif + +super-distclean: + @ make -C $(KCONFIG_DIR) clean + @ rm -rf $(BUILD_DIR) + @ rm -f .config tmpconfig.h .kconfig.d .config.old + +ifeq ($(config-targets),1) + +$(KCONFIG_DIR)/conf: + make -C $(KCONFIG_DIR) conf + +textconfig: $(KCONFIG_DIR)/conf + @$(KCONFIG_DIR)/conf $(BASE_DIR)/Config.in + +oldconfig: $(KCONFIG_DIR)/conf + @$(KCONFIG_DIR)/conf -o $(BASE_DIR)/Config.in + +defconfig: $(KCONFIG_DIR)/conf + @$(KCONFIG_DIR)/conf -d $(BASE_DIR)/Config.in +endif
Copied: buildrom-devel/README (from rev 13, buildrom-devel/buildrom/README) =================================================================== --- buildrom-devel/README (rev 0) +++ buildrom-devel/README 2007-06-28 16:56:00 UTC (rev 14) @@ -0,0 +1,68 @@ +Buildrom README + +I bend a grateful knee to my good friend Erik Andersen, and his buildroot +system from which most of the ideas for this were derived. + +Introduction + +This is a simple makefile system that designed to build a ROM image for +LinuxBIOS based systems. This system allows one to choose one of several +different payloads for a variety of platforms. The intention of buildROM +is to build everythign together with one step, rather then the 6 or 8 +individual steps that it would hae taken previously. + +Payloads + +BuildROM supports 7 different payload configurations: + +* Custom - Allows you to specify an external ELF file +* Etherboot +* FILO +* Kernel - build a kernel payload (just the kernel - no initramfs) +* LAB - Build a kernel plus a Linux As Bootloader initramfs attached to it +* OFW - Open Firmware +* Memtest - Memtest86 + +Configuration + +To configure the system, type 'make oldconfig', and answer the questions. + +CONFIG_VERBOSE - show build output on stdout instead of a log file +CONFIG_ADVANCED - select some advanced options: + CONFIG_USE_LZMA - Compress payloads with LZMA (requires LB support) + CONFIG_LB_USE_BUILD - Say 'y' here to specify an existing build + directory for LinuxBIOS. This is useful if you + want build out of your development tree. + CONFIG_LB_BUILDDIR - Specify your remote LinuxBIOS build directory here + +Some of the payload options have their own configuration: + +Custom: + CONFIG_CUSTOM_PAYLOAD - specify a filename for the custom payload + +Kernel: + CONFIG_CMDLINE - Specify a command line to use for the kernel build + +LaB: + CONFIG_KBL_KEXEC_ONLY - Build only the Kexec part of the KBL + CONFIG_KBL - Build Marcelo Toscatti's kernel boot loader + CONFIG_BUSYBOX - Build busybox + CONFIG_BOOTMENU - Build the OLPC bootmenu + CONFIG_OLPCFLASH - Build the 'olpcflash' utility + +memtest: + CONFIG_MEMTEST_SERIAL - say 'y' here to enable serial output for memtest + +etherboot: + CONFIG_ETHERBOOT_DRIVER - specify the name of the NIC driver for etherboot, + i.e 'natsemi' + + +Building the ROM + +To run the system, type 'make'. You'll need a connection to the net to +suck down tarballs for the individual packages. + +The end result is a .rom file in the deploy/ directory. + +
Copied: buildrom-devel/README.signature (from rev 13, buildrom-devel/buildrom/README.signature) =================================================================== --- buildrom-devel/README.signature (rev 0) +++ buildrom-devel/README.signature 2007-06-28 16:56:00 UTC (rev 14) @@ -0,0 +1,35 @@ +Description of the fimrware signature + +Pulled from http://dev.laptop.org/ticket/153. + +Here's the format: + +At offset f.ffc0 in FLASH: +BW2 Q1A82 Q1A +------..... --- + | | | + | | |---First 3 characters of revision + | | + | |---Revision + | + |--- Model + +Revision is: + +Q - Manufacturer, i.e. Quanta +1 - board revision number +A - Major firmware revision +82- Minor firmware revision + +------- Quanta describes their release sequence: + +Let me explain our ISO sequence: Qxxxx First x: 1 for A test, 2 for B test, 3 for C test Second x: A~Z: milestone Third x: 1~9: change when test team release to customer, manufacture (outside R&D) Forth x: 1~9: change when sw team release to test team.(inside R&D) + +Take EC as example: Q1A11 when sw team release to test team. Test team find some problems, can not relase out Q1A12 when sw team fix the problem and release to test team again Test team test OK, and release out + +Next version sw team release will be Q1A21 + +As I mentioned we will use file name to distinguish the release. + +EC release will be PQ1A21.bin (Leading by P) BIOS release will be BQ2A11.bin (leading by B) +
Copied: buildrom-devel/bin (from rev 13, buildrom-devel/buildrom/bin)
Deleted: buildrom-devel/buildrom/Config.in =================================================================== --- buildrom-devel/buildrom/Config.in 2007-06-21 16:39:46 UTC (rev 13) +++ buildrom-devel/buildrom/Config.in 2007-06-28 16:56:00 UTC (rev 14) @@ -1,69 +0,0 @@ -# The base kbuild file for buildrom - -mainmenu "Buildrom Configuration" - -config HAVE_DOT_CONFIG - bool - default y - -config VERBOSE - bool "See the build output on stdout" - default n - help - See the entire build output on stdout. Otherwise, it will - be saved off in a series of logs - -config ADVANCED - bool "Enable advanced operations" - default n - help - Allow yourself to do advanced developer things - -menu "LinuxBIOS configuration" - -config USE_LZMA - bool "Enable LZMA compression" - depends !PAYLOAD_OFW - default y - help - Allow LZMA compression for the payload. This doesn't work - for OFW. - - -config LB_USE_BUILD - bool "Specify a LinuxBIOS build dir" - depends ADVANCED - default n - help - Say 'y' here to specify an existing directory to build - LinuxBIOS from - this is useful if you have local development - tree you wish to work from - -config LB_BUILDDIR - string "LinuxBIOS build directory" - depends LB_USE_BUILD - -config LB_CUSTOM_REV - bool "Override the platform LinuxBIOS revision" - depends ADVANCED && !LB_USE_BUILD - default n - help - Say 'y' here to overide the default LinuxBIOS SVN revsion - from the platform configuration - -config LB_REVISION - string "LinuxBIOS revision" - depends LB_CUSTOM_REV - -endmenu - -config PLATFORM - bool - default n - -config PAYLOAD - bool - default n - -source config/platforms/Config.in -source config/payloads/Config.in
Deleted: buildrom-devel/buildrom/Makefile =================================================================== --- buildrom-devel/buildrom/Makefile 2007-06-21 16:39:46 UTC (rev 13) +++ buildrom-devel/buildrom/Makefile 2007-06-28 16:56:00 UTC (rev 14) @@ -1,97 +0,0 @@ -BASE_DIR=$(shell pwd) - -SCRIPT_DIR=$(BASE_DIR)/scripts -KCONFIG_DIR=$(SCRIPT_DIR)/kconfig -CONFIG_DIR=$(BASE_DIR)/config - -SOURCE_DIR=$(BASE_DIR)/sources -BUILD_DIR=$(BASE_DIR)/work -INITRD_DIR=$(BASE_DIR)/initrd-rootfs -STAGING_DIR=$(BASE_DIR)/staging -SKELETON_DIR=$(BASE_DIR)/skeleton -OUTPUT_DIR=$(BASE_DIR)/deploy -PACKAGE_DIR=$(BASE_DIR)/packages -BIN_DIR=$(BASE_DIR)/bin - -ifeq (.config, $(wildcard .config)) -dot-config := 1 -else -dot-config := 0 -config-targets := 1 -endif - -ifneq ($(filter config %config,$(MAKECMDGOALS)),) -config-targets := 1 -dot-config := 0 -endif - -ifeq ($(dot-config),0) -all: .config - -.config: oldconfig - @echo "Configuration completed - type make to build your ROM" -else --include .config - -include $(CONFIG_DIR)/platforms/platforms.conf -include $(CONFIG_DIR)/payloads/payloads.conf - -# Include the global settings and other checks -include $(SCRIPT_DIR)/Build.settings - -# Construct the list of packages we will be building - -PKGLIST = linuxbios $(PAYLOAD-y) $(HOSTTOOLS-y) - -# Construct the various targets - -PKG_clean=$(patsubst %, %-clean, $(PKGLIST)) -PKG_distclean=$(patsubst %, %-distclean, $(PKGLIST)) - -all: $(HOSTTOOLS-y) payload linuxbios - -payload: $(PAYLOAD_TARGET) - -clean: $(PKG_clean) - @ rm -rf $(INITRD_DIR) $(OUTPUT_DIR) - -distclean: $(PKG_distclean) - @ rm -rf $(OUTPUT_DIR) $(STAGING_DIR) $(INITRD_DIR) - @ rm -f $(BASE_DIR).config - -# Include the payload builder - -ifneq ($(PAYLOAD_BUILD),) -include $(PAYLOAD_BUILD) -endif - -# The following code gets all the make targets, but filters out the kernel -# targets which are implicitly set by the platform configuration - -MKTARGETS:= $(shell ls $(PACKAGE_DIR)/*/*.mk) - -include $(filter-out $(PACKAGE_DIR)/kernel/% $(PACKAGE_DIR)/linuxbios/%,$(MKTARGETS)) - -include $(KERNEL_MK) $(LINUXBIOS_MK) - -endif - -super-distclean: - @ make -C $(KCONFIG_DIR) clean - @ rm -rf $(BUILD_DIR) - @ rm -f .config tmpconfig.h .kconfig.d .config.old - -ifeq ($(config-targets),1) - -$(KCONFIG_DIR)/conf: - make -C $(KCONFIG_DIR) conf - -textconfig: $(KCONFIG_DIR)/conf - @$(KCONFIG_DIR)/conf $(BASE_DIR)/Config.in - -oldconfig: $(KCONFIG_DIR)/conf - @$(KCONFIG_DIR)/conf -o $(BASE_DIR)/Config.in - -defconfig: $(KCONFIG_DIR)/conf - @$(KCONFIG_DIR)/conf -d $(BASE_DIR)/Config.in -endif
Deleted: buildrom-devel/buildrom/README =================================================================== --- buildrom-devel/buildrom/README 2007-06-21 16:39:46 UTC (rev 13) +++ buildrom-devel/buildrom/README 2007-06-28 16:56:00 UTC (rev 14) @@ -1,68 +0,0 @@ -Buildrom README - -I bend a grateful knee to my good friend Erik Andersen, and his buildroot -system from which most of the ideas for this were derived. - -Introduction - -This is a simple makefile system that designed to build a ROM image for -LinuxBIOS based systems. This system allows one to choose one of several -different payloads for a variety of platforms. The intention of buildROM -is to build everythign together with one step, rather then the 6 or 8 -individual steps that it would hae taken previously. - -Payloads - -BuildROM supports 7 different payload configurations: - -* Custom - Allows you to specify an external ELF file -* Etherboot -* FILO -* Kernel - build a kernel payload (just the kernel - no initramfs) -* LAB - Build a kernel plus a Linux As Bootloader initramfs attached to it -* OFW - Open Firmware -* Memtest - Memtest86 - -Configuration - -To configure the system, type 'make oldconfig', and answer the questions. - -CONFIG_VERBOSE - show build output on stdout instead of a log file -CONFIG_ADVANCED - select some advanced options: - CONFIG_USE_LZMA - Compress payloads with LZMA (requires LB support) - CONFIG_LB_USE_BUILD - Say 'y' here to specify an existing build - directory for LinuxBIOS. This is useful if you - want build out of your development tree. - CONFIG_LB_BUILDDIR - Specify your remote LinuxBIOS build directory here - -Some of the payload options have their own configuration: - -Custom: - CONFIG_CUSTOM_PAYLOAD - specify a filename for the custom payload - -Kernel: - CONFIG_CMDLINE - Specify a command line to use for the kernel build - -LaB: - CONFIG_KBL_KEXEC_ONLY - Build only the Kexec part of the KBL - CONFIG_KBL - Build Marcelo Toscatti's kernel boot loader - CONFIG_BUSYBOX - Build busybox - CONFIG_BOOTMENU - Build the OLPC bootmenu - CONFIG_OLPCFLASH - Build the 'olpcflash' utility - -memtest: - CONFIG_MEMTEST_SERIAL - say 'y' here to enable serial output for memtest - -etherboot: - CONFIG_ETHERBOOT_DRIVER - specify the name of the NIC driver for etherboot, - i.e 'natsemi' - - -Building the ROM - -To run the system, type 'make'. You'll need a connection to the net to -suck down tarballs for the individual packages. - -The end result is a .rom file in the deploy/ directory. - -
Deleted: buildrom-devel/buildrom/README.signature =================================================================== --- buildrom-devel/buildrom/README.signature 2007-06-21 16:39:46 UTC (rev 13) +++ buildrom-devel/buildrom/README.signature 2007-06-28 16:56:00 UTC (rev 14) @@ -1,35 +0,0 @@ -Description of the fimrware signature - -Pulled from http://dev.laptop.org/ticket/153. - -Here's the format: - -At offset f.ffc0 in FLASH: -BW2 Q1A82 Q1A -------..... --- - | | | - | | |---First 3 characters of revision - | | - | |---Revision - | - |--- Model - -Revision is: - -Q - Manufacturer, i.e. Quanta -1 - board revision number -A - Major firmware revision -82- Minor firmware revision - -------- Quanta describes their release sequence: - -Let me explain our ISO sequence: Qxxxx First x: 1 for A test, 2 for B test, 3 for C test Second x: A~Z: milestone Third x: 1~9: change when test team release to customer, manufacture (outside R&D) Forth x: 1~9: change when sw team release to test team.(inside R&D) - -Take EC as example: Q1A11 when sw team release to test team. Test team find some problems, can not relase out Q1A12 when sw team fix the problem and release to test team again Test team test OK, and release out - -Next version sw team release will be Q1A21 - -As I mentioned we will use file name to distinguish the release. - -EC release will be PQ1A21.bin (Leading by P) BIOS release will be BQ2A11.bin (leading by B) -
Copied: buildrom-devel/config (from rev 13, buildrom-devel/buildrom/config)
Copied: buildrom-devel/packages (from rev 13, buildrom-devel/buildrom/packages)
Copied: buildrom-devel/scripts (from rev 13, buildrom-devel/buildrom/scripts)
Copied: buildrom-devel/skeleton (from rev 13, buildrom-devel/buildrom/skeleton)