diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-14 21:03:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-14 21:03:39 +0200 |
| commit | 8f14c0a6a92932e0cf7459e9243afbebfef78ac2 (patch) | |
| tree | 35b286c30f8406dc378943e15d80dce621652c7c /target | |
| parent | 1a4ca0013db4236f3e0ff8746a1787dbe560b970 (diff) | |
| parent | 7c7cd30c44da0ca33ac86eeed01d7e9522b0c93a (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.tools | 5 | ||||
| -rw-r--r-- | target/x86/Makefile | 4 | ||||
| -rw-r--r-- | target/x86/sys-available/generic-pc | 1 | ||||
| -rw-r--r-- | target/x86/sys-available/ibm-x40 | 2 | ||||
| -rw-r--r-- | target/x86_64/Makefile | 15 |
5 files changed, 25 insertions, 2 deletions
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index b3e900bb3..d66a7e400 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -14,6 +14,7 @@ config ADK_HOST_BUILD_BASH config ADK_HOST_BUILD_BC boolean + select ADK_HOST_BUILD_FLEX default n config ADK_HOST_BUILD_BISON @@ -40,6 +41,10 @@ config ADK_HOST_BUILD_M4 boolean default n +config ADK_HOST_BUILD_PATCH + boolean + default n + config ADK_HOST_BUILD_PKGCONF boolean default n diff --git a/target/x86/Makefile b/target/x86/Makefile index 27920819f..736f1c359 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -9,7 +9,11 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y) +CREATE:=./scripts/create.sh -g -t +else CREATE:=./scripts/create.sh -g +endif else CREATE:=./scripts/create.sh endif diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc index 76d228936..72ae99765 100644 --- a/target/x86/sys-available/generic-pc +++ b/target/x86/sys-available/generic-pc @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_GENERIC_PC select ADK_generic_pc select ADK_CPU_I486 select ADK_TARGET_KERNEL_BZIMAGE + select ADK_PACKAGE_GRUB help Support for generic PC (i486). diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 80c5bf531..df11b1f3f 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -21,6 +21,6 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_WITH_PP select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_BZIMAGE - select ADK_PACKAGE_GRUB_BIN + select ADK_PACKAGE_GRUB help System profile for IBM X40 laptop. diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index c94c3a1a6..63785c12a 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -8,6 +8,15 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y) +CREATE:=./scripts/create.sh -g -t +else +CREATE:=./scripts/create.sh -g +endif +else +CREATE:=./scripts/create.sh +endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -15,11 +24,15 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) + @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' +else @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif +endif ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) |