diff options
| -rw-r--r-- | target/config/Config.in.cpu | 12 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 8 | ||||
| -rw-r--r-- | target/x86_64/kernel/pcengines-apu | 3 | ||||
| -rw-r--r-- | target/x86_64/systems/pcengines-apu | 2 |
4 files changed, 17 insertions, 8 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 9ccdb8021..b07ef59b9 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -8,6 +8,12 @@ config ADK_CPU_ALPHA select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU +config ADK_CPU_AMD_BOBCAT + bool + select ADK_LINUX_64 + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU + config ADK_CPU_AMDFAM10 bool select ADK_LINUX_64 @@ -730,6 +736,7 @@ config ADK_TARGET_GCC_CPU config ADK_TARGET_GCC_ARCH string + default "btver1" if ADK_CPU_AMD_BOBCAT default "amdfam10" if ADK_CPU_AMDFAM10 default "athlon" if ADK_CPU_ATHLON default "atom" if ADK_CPU_ATOM @@ -903,7 +910,6 @@ config ADK_TARGET_CPU_ARCH default "sh4aeb" if ADK_CPU_SH4A && ADK_TARGET_BIG_ENDIAN default "sparc" if ADK_TARGET_ARCH_SPARC default "sparc64" if ADK_TARGET_ARCH_SPARC64 - default "tilegx" if ADK_CPU_TILE - default "x86_64" if ADK_CPU_X86_64 - default "x86_64" if ADK_CPU_AMDFAM10 + default "tilegx" if ADK_TARGET_ARCH_TILE + default "x86_64" if ADK_TARGET_ARCH_X86_64 default "xtensa" if ADK_TARGET_ARCH_XTENSA diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index f88b05efb..a948407e6 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_SERIAL || ADK_TARGET_QEMU || ADK_TARGET_VBOX config ADK_KERNEL_SERIAL_8250_CONSOLE bool +config ADK_KERNEL_SERIAL_8250_PNP + bool + config ADK_KERNEL_SERIAL_OF_PLATFORM bool @@ -28,9 +31,12 @@ config ADK_KERNEL_SERIAL_ETRAXFS config ADK_KERNEL_SERIAL_8250 bool "8250 serial driver" select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 + select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_KERNEL_SERIAL_8250_CONSOLE - depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 + depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ + || ADK_TARGET_SYSTEM_PCENGINES_APU default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 + default y if ADK_TARGET_SYSTEM_PCENGINES_APU default n help Serial driver for 8250 UART chip. diff --git a/target/x86_64/kernel/pcengines-apu b/target/x86_64/kernel/pcengines-apu index 83f47ee31..a48e05035 100644 --- a/target/x86_64/kernel/pcengines-apu +++ b/target/x86_64/kernel/pcengines-apu @@ -9,6 +9,3 @@ CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu index 6159eda1c..33bbbf67b 100644 --- a/target/x86_64/systems/pcengines-apu +++ b/target/x86_64/systems/pcengines-apu @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_APU bool "PC Engines APU" - select ADK_CPU_X86_64 + select ADK_CPU_AMD_BOBCAT select ADK_TARGET_KERNEL_BZIMAGE select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_SERIAL |