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/x86 | |
| parent | 1a4ca0013db4236f3e0ff8746a1787dbe560b970 (diff) | |
| parent | 7c7cd30c44da0ca33ac86eeed01d7e9522b0c93a (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'target/x86')
| -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 |
3 files changed, 6 insertions, 1 deletions
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. |