summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/linux/config/Config.in.block14
-rw-r--r--target/linux/config/Config.in.serial6
-rw-r--r--target/x86/kernel/generic-x86 (renamed from target/x86/kernel/generic-pc)0
-rw-r--r--target/x86/systems/generic-x86 (renamed from target/x86/systems/generic-pc)4
-rw-r--r--target/x86_64/kernel/generic-x86_647
-rw-r--r--target/x86_64/systems/generic-x86_6418
6 files changed, 39 insertions, 10 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 995730c90..f2e096cea 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -165,7 +165,8 @@ config ADK_KERNEL_SATA_AHCI
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
depends on ADK_TARGET_SYSTEM_PCENGINES_APU || \
- ADK_TARGET_SYSTEM_GENERIC_PC || \
+ ADK_TARGET_SYSTEM_GENERIC_X86 || \
+ ADK_TARGET_SYSTEM_GENERIC_X86_64 || \
ADK_TARGET_VBOX
default y if ADK_TARGET_SYSTEM_PCENGINES_APU
default y if ADK_TARGET_VBOX
@@ -185,11 +186,12 @@ config ADK_KERNEL_ATA_PIIX
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
depends on ADK_TARGET_SYSTEM_IBM_X40 || \
- ADK_TARGET_SYSTEM_GENERIC_PC || \
- ADK_TARGET_SYSTEM_QEMU_MIPS || \
- ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
- ADK_TARGET_SYSTEM_QEMU_X86 || \
- ADK_TARGET_SYSTEM_QEMU_X86_64
+ ADK_TARGET_SYSTEM_GENERIC_X86 || \
+ ADK_TARGET_SYSTEM_GENERIC_X86_64 || \
+ ADK_TARGET_SYSTEM_QEMU_MIPS || \
+ ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
+ ADK_TARGET_SYSTEM_QEMU_X86 || \
+ ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_IBM_X40
default n
help
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 45838bf26..24830d595 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -54,7 +54,8 @@ config ADK_KERNEL_SERIAL_8250
|| ADK_TARGET_SYSTEM_OR1K_SIM \
|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
|| ADK_TARGET_SYSTEM_IBM_X40 \
- || ADK_TARGET_SYSTEM_GENERIC_PC \
+ || ADK_TARGET_SYSTEM_GENERIC_X86 \
+ || ADK_TARGET_SYSTEM_GENERIC_X86_64 \
|| ADK_TARGET_SYSTEM_MIKROTIK_RB532 \
|| ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
@@ -64,7 +65,8 @@ config ADK_KERNEL_SERIAL_8250
default y if ADK_TARGET_SYSTEM_OR1K_SIM
default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_GENERIC_PC
+ default y if ADK_TARGET_SYSTEM_GENERIC_X86
+ default y if ADK_TARGET_SYSTEM_GENERIC_X86_64
default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
default y if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
default n
diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-x86
index 3c2b8355f..3c2b8355f 100644
--- a/target/x86/kernel/generic-pc
+++ b/target/x86/kernel/generic-x86
diff --git a/target/x86/systems/generic-pc b/target/x86/systems/generic-x86
index 05c470233..1aacceac4 100644
--- a/target/x86/systems/generic-pc
+++ b/target/x86/systems/generic-x86
@@ -1,5 +1,5 @@
-config ADK_TARGET_SYSTEM_GENERIC_PC
- bool "Generic PC"
+config ADK_TARGET_SYSTEM_GENERIC_X86
+ bool "Generic x86 PC (i686)"
select ADK_CPU_I686
select ADK_TARGET_KERNEL_BZIMAGE
select ADK_TARGET_WITH_PCI
diff --git a/target/x86_64/kernel/generic-x86_64 b/target/x86_64/kernel/generic-x86_64
new file mode 100644
index 000000000..b17b6e256
--- /dev/null
+++ b/target/x86_64/kernel/generic-x86_64
@@ -0,0 +1,7 @@
+CONFIG_X86=y
+CONFIG_X86_64=y
+CONFIG_X86_X32=y
+CONFIG_GENERIC_CPU=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
diff --git a/target/x86_64/systems/generic-x86_64 b/target/x86_64/systems/generic-x86_64
new file mode 100644
index 000000000..b3fbff63c
--- /dev/null
+++ b/target/x86_64/systems/generic-x86_64
@@ -0,0 +1,18 @@
+config ADK_TARGET_SYSTEM_GENERIC_X86_64
+ bool "Generic x86_64 PC"
+ select ADK_CPU_X86_64
+ select ADK_TARGET_KERNEL_BZIMAGE
+ select ADK_TARGET_WITH_PCI
+ select ADK_TARGET_WITH_SERIAL
+ select ADK_TARGET_WITH_USB
+ select ADK_TARGET_WITH_VGA
+ select ADK_TARGET_WITH_NET
+ select ADK_TARGET_WITH_NETDEVICE
+ select ADK_TARGET_WITH_BLOCK
+ select ADK_TARGET_WITH_PATA
+ select ADK_TARGET_WITH_SATA
+ select ADK_PACKAGE_GRUB
+ help
+ Example config for generic x86_64 based PC.
+ You need to enable all required drivers manually.
+