diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /configs | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
| download | buildroot-novena-c3b72c6cd7b82e70cf61f4eac59f176444eaebf1.tar.gz buildroot-novena-c3b72c6cd7b82e70cf61f4eac59f176444eaebf1.zip | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/qemu_sparc_ss10_defconfig | 14 | ||||
| -rw-r--r-- | configs/qemu_x86_64_defconfig | 17 | ||||
| -rw-r--r-- | configs/qemu_x86_defconfig | 5 |
3 files changed, 34 insertions, 2 deletions
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig new file mode 100644 index 000000000..20cd9fbf5 --- /dev/null +++ b/configs/qemu_sparc_ss10_defconfig @@ -0,0 +1,14 @@ +# Architecture +BR2_sparc=y +BR2_sparc_supersparc=y + +# filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Linux kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1" +BR2_LINUX_KERNEL_DEFCONFIG="sparc32" +BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig new file mode 100644 index 000000000..e6a59ac24 --- /dev/null +++ b/configs/qemu_x86_64_defconfig @@ -0,0 +1,17 @@ +# Architecture +BR2_x86_64=y + +# system +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="tty1" + +# filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.1.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index d60b38d5b..8efe9ae43 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -4,6 +4,7 @@ BR2_x86_pentiumpro=y # system BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="tty1" # filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -12,6 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.0.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.0.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.1.config" |