aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-09-01 15:22:07 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-09-01 15:22:07 +0200
commit5aedb8be688d47526101bdb3e58598df588326e6 (patch)
treeae348b9262fdaf123b3b152e65b6116b5ef36cb4 /configs
parent7f0ce7c8780569afa33b68c9c024bf4072e29a99 (diff)
parent62387a8b11224a9c5320d42e2f0c4e2089d3452b (diff)
downloadbuildroot-5aedb8be688d47526101bdb3e58598df588326e6.tar.gz
buildroot-5aedb8be688d47526101bdb3e58598df588326e6.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/nitrogen6x_defconfig2
-rw-r--r--configs/qemu_ppc64_pseries_defconfig23
2 files changed, 24 insertions, 1 deletions
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 082b1f58ec..5e5b91eee1 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -16,7 +16,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/4034391/u-boot-4034391.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/63ae4a5/u-boot-63ae4a5.tar.gz"
# kernel
BR2_LINUX_KERNEL=y
diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig
new file mode 100644
index 0000000000..802ee08bd2
--- /dev/null
+++ b/configs/qemu_ppc64_pseries_defconfig
@@ -0,0 +1,23 @@
+# Architecture
+BR2_powerpc64=y
+BR2_powerpc_power7=y
+
+# System
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Lock to 3.16 headers to avoid breaking with newer kernels
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.16.1"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.1"
+BR2_LINUX_KERNEL_DEFCONFIG="pseries"
+BR2_LINUX_KERNEL_VMLINUX=y