mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:34:36 +02:00
[backfire] merge [21362:21365] & [21369]
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21476 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f9f05264eb
commit
0b454c4919
@ -102,7 +102,7 @@ menu "Target Images"
|
||||
|
||||
source "target/linux/*/image/Config.in"
|
||||
|
||||
config TARGET_ROOTFS_FSPART
|
||||
config TARGET_ROOTFS_PARTSIZE
|
||||
int "Root filesystem partition size (in MB)"
|
||||
depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532
|
||||
default 48
|
||||
|
@ -110,7 +110,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_TARGET_ROOTFS_EXT2FS),)
|
||||
E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024)))
|
||||
E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024)))
|
||||
|
||||
define Image/mkfs/ext2
|
||||
$(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2
|
||||
|
@ -55,7 +55,7 @@ endef
|
||||
define Image/Build
|
||||
$(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel
|
||||
$(STAGING_DIR_HOST)/bin/patch-cmdline $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel '$(strip $(call Image/cmdline/$(1))) '
|
||||
./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin 4 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
|
||||
./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).bin 4 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
|
||||
endef
|
||||
|
||||
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
|
||||
|
@ -1,91 +1,73 @@
|
||||
config X86_GRUB_IMAGES
|
||||
bool "Build GRUB images (Linux x86 or x86_64 host only)"
|
||||
depends TARGET_x86 && !TARGET_x86_olpc
|
||||
depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
|
||||
select PACKAGE_grub
|
||||
default y
|
||||
|
||||
config X86_GRUB_IMAGES_PAD
|
||||
bool "Pad GRUB images to filesystem size (for JFFS2)"
|
||||
depends X86_GRUB_IMAGES
|
||||
bool "Build GRUB images (Linux x86 or x86_64 host only)"
|
||||
depends TARGET_x86 && !TARGET_x86_olpc
|
||||
depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
|
||||
select PACKAGE_grub
|
||||
default y
|
||||
|
||||
config X86_GRUB_CONSOLE
|
||||
bool
|
||||
depends X86_GRUB_IMAGES
|
||||
prompt "Use Console Terminal (in addition to Serial)"
|
||||
default n if TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx
|
||||
default y if ! (TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx)
|
||||
bool "Use Console Terminal (in addition to Serial)"
|
||||
depends X86_GRUB_IMAGES
|
||||
default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx)
|
||||
|
||||
config X86_GRUB_SERIAL
|
||||
string
|
||||
prompt "Serial port device"
|
||||
depends X86_GRUB_IMAGES
|
||||
default "hvc0" if TARGET_x86_xen_domu
|
||||
default "ttyS0" if ! TARGET_x86_xen_domu
|
||||
string "Serial port device"
|
||||
depends X86_GRUB_IMAGES
|
||||
default "hvc0" if TARGET_x86_xen_domu
|
||||
default "ttyS0"
|
||||
|
||||
config X86_GRUB_BAUDRATE
|
||||
int "Serial port baud rate"
|
||||
depends X86_GRUB_IMAGES
|
||||
default 19200 if TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx
|
||||
default 38400 if ! (TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx)
|
||||
|
||||
config X86_GRUB_KERNELPART
|
||||
int "Kernel partition size (in MB)"
|
||||
depends X86_GRUB_IMAGES
|
||||
default 4
|
||||
|
||||
config X86_GRUB_ROOTPART
|
||||
string
|
||||
prompt "Root partition on target device" if X86_GRUB_IMAGES
|
||||
default "/dev/xvda2" if TARGET_x86_xen_domu
|
||||
default "/dev/sda2" if ! TARGET_x86_xen_domu
|
||||
help
|
||||
The root partition on the final device. If you don't know,
|
||||
you probably want the default (/dev/sda2).
|
||||
int "Serial port baud rate"
|
||||
depends X86_GRUB_IMAGES
|
||||
default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx
|
||||
default 38400
|
||||
|
||||
config X86_GRUB_BOOTOPTS
|
||||
string
|
||||
prompt "Extra kernel boot options" if X86_GRUB_IMAGES
|
||||
default "xencons=hvc" if TARGET_x86_xen_domu
|
||||
default "" if ! TARGET_x86_xen_domu
|
||||
help
|
||||
If you don't know, just leave it blank.
|
||||
|
||||
string "Extra kernel boot options"
|
||||
depends X86_GRUB_IMAGES
|
||||
default "xencons=hvc" if TARGET_x86_xen_domu
|
||||
help
|
||||
If you don't know, just leave it blank.
|
||||
|
||||
config X86_VDI_IMAGES
|
||||
bool "Build VirtualBox image files (VDI). Requires VBoxManage"
|
||||
depends TARGET_x86_generic
|
||||
depends TARGET_ROOTFS_EXT2FS
|
||||
depends X86_GRUB_IMAGES
|
||||
select PACKAGE_kmod-pcnet32
|
||||
bool "Build VirtualBox image files (VDI)"
|
||||
depends X86_GRUB_IMAGES
|
||||
depends TARGET_x86_generic
|
||||
depends TARGET_ROOTFS_EXT2FS
|
||||
select PACKAGE_kmod-pcnet32
|
||||
help
|
||||
Requires VBoxManage installed on the build system.
|
||||
|
||||
config X86_VMDK_IMAGES
|
||||
bool "Build VMware image files (VMDK). Requires qemu-img"
|
||||
depends TARGET_x86_generic
|
||||
depends TARGET_ROOTFS_EXT2FS
|
||||
depends X86_GRUB_IMAGES
|
||||
select PACKAGE_kmod-e1000
|
||||
bool "Build VMware image files (VMDK)"
|
||||
depends X86_GRUB_IMAGES
|
||||
depends TARGET_x86_generic
|
||||
depends TARGET_ROOTFS_EXT2FS
|
||||
select PACKAGE_kmod-e1000
|
||||
help
|
||||
Requires qemu-img installed on the build system.
|
||||
|
||||
|
||||
config OLPC_BOOTSCRIPT_IMAGES
|
||||
bool "Build images with bootscript"
|
||||
depends TARGET_x86_olpc
|
||||
depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
|
||||
default y
|
||||
bool "Build images with bootscript"
|
||||
depends TARGET_x86_olpc
|
||||
depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
|
||||
|
||||
config OLPC_BOOTSCRIPT_IMAGES_PAD
|
||||
bool "Pad bootscript images to filesystem size (for JFFS2)"
|
||||
depends OLPC_BOOTSCRIPT_IMAGES
|
||||
|
||||
config OLPC_BOOTSCRIPT_KERNELPART
|
||||
int "Kernel partition size (in MB)"
|
||||
depends OLPC_BOOTSCRIPT_IMAGES
|
||||
default 4
|
||||
config TARGET_IMAGES_PAD
|
||||
bool "Pad images to filesystem size (for JFFS2)"
|
||||
depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
|
||||
|
||||
config OLPC_BOOTSCRIPT_ROOTPART
|
||||
string
|
||||
prompt "Root partition on target device" if OLPC_BOOTSCRIPT_IMAGES
|
||||
default "/dev/sda2"
|
||||
help
|
||||
The root partition on the final device. If you don't know,
|
||||
you probably want the default (/dev/sda2).
|
||||
config TARGET_KERNEL_PARTSIZE
|
||||
int "Kernel partition size (in MB)"
|
||||
depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
|
||||
default 4
|
||||
|
||||
config TARGET_ROOTFS_PARTNAME
|
||||
string "Root partition on target device"
|
||||
depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
|
||||
default "/dev/xvda2" if TARGET_x86_xen_domu
|
||||
default "/dev/sda2"
|
||||
help
|
||||
The root partition on the final device. If you don't know,
|
||||
you probably want the default (/dev/sda2).
|
||||
|
@ -29,12 +29,12 @@ ifneq ($(GRUB_TERMINALS),)
|
||||
GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS)
|
||||
endif
|
||||
|
||||
ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
|
||||
|
||||
ifneq ($(CONFIG_X86_GRUB_IMAGES),)
|
||||
ifneq ($(HOST_OS),Darwin)
|
||||
|
||||
BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
|
||||
ROOTPART:=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART))
|
||||
|
||||
define Image/cmdline/ext2
|
||||
root=$(ROOTPART) rootfstype=ext2 rootwait
|
||||
@ -66,10 +66,10 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
|
||||
-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
|
||||
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
|
||||
./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
|
||||
PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \
|
||||
PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||
$(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \
|
||||
$(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
|
||||
$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \
|
||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
|
||||
$(call Image/Build/grub/$(1))
|
||||
endef
|
||||
|
||||
@ -88,8 +88,8 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
|
||||
define Image/Build/grub
|
||||
PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||
$(CONFIG_X86_GRUB_KERNELPART) "" \
|
||||
$(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
|
||||
$(CONFIG_TARGET_KERNEL_PARTSIZE) "" \
|
||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
|
||||
endef
|
||||
|
||||
endif
|
||||
@ -99,8 +99,6 @@ ROOTDELAY=10
|
||||
|
||||
ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
|
||||
|
||||
ROOTPART:=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))
|
||||
|
||||
define Image/cmdline/ext2
|
||||
root=$(ROOTPART) rootfstype=ext2 rootwait
|
||||
endef
|
||||
@ -123,10 +121,10 @@ ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
|
||||
$(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
|
||||
sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
|
||||
./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth
|
||||
PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \
|
||||
PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||
$(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \
|
||||
$(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
|
||||
$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.bootscript \
|
||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
|
||||
endef
|
||||
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user