Commit 5aedb8be authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next' 



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents 7f0ce7c8 62387a8b

board/qemu/powerpc64-pseries/readme.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Run the emulation with:



 qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append 'console=hvc0 root=/dev/sda' -drive file=output/images/rootfs.ext2,if=scsi,index=0 -serial stdio -display curses



The login prompt will appear in the terminal that started Qemu.



Tested with QEMU 2.1.0

boot/barebox/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ choice 
	  Select the specific Barebox version you want to use



config BR2_TARGET_BAREBOX_LATEST_VERSION

	bool "2014.07.0"

	bool "2014.08.0"



config BR2_TARGET_BAREBOX_CUSTOM_VERSION

	bool "Custom version"
@@ -40,7 +40,7 @@ endif 


config BR2_TARGET_BAREBOX_VERSION

	string

	default "2014.07.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION

	default "2014.08.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION

	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION

	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL

	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT

configs/nitrogen6x_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

configs/qemu_ppc64_pseries_defconfig

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# 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

package/Config.in

+3 −0
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ menu "Hardware handling" 
	source "package/libllcp/Config.in"

	source "package/libmbim/Config.in"

	source "package/libnfc/Config.in"

	source "package/libphidget/Config.in"

	source "package/libqmi/Config.in"

	source "package/libraw1394/Config.in"

	source "package/librtlsdr/Config.in"
@@ -1031,6 +1032,7 @@ endif 
	source "package/noip/Config.in"

	source "package/ntp/Config.in"

	source "package/nuttcp/Config.in"

	source "package/odhcploc/Config.in"

	source "package/olsr/Config.in"

	source "package/openntpd/Config.in"

	source "package/openobex/Config.in"
@@ -1038,6 +1040,7 @@ endif 
	source "package/openswan/Config.in"

	source "package/openvpn/Config.in"

	source "package/p910nd/Config.in"

	source "package/phidgetwebservice/Config.in"

	source "package/portmap/Config.in"

	source "package/pppd/Config.in"

	source "package/pptp-linux/Config.in"