diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
commit | 7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch) | |
tree | d93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /configs | |
parent | 1021766976319b40e64ca8dee12d21c758197801 (diff) | |
parent | e6803b9f91357773154daed13d6e83712d49476c (diff) | |
download | buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.gz buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.zip |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/armadeus_apf27_defconfig | 8 | ||||
-rw-r--r-- | configs/atngw100_defconfig | 35 | ||||
-rw-r--r-- | configs/atstk100x_defconfig | 26 | ||||
-rw-r--r-- | configs/raspberrypi2_defconfig | 25 |
4 files changed, 29 insertions, 65 deletions
diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig index 7e33a41f19..b779e6b12f 100644 --- a/configs/armadeus_apf27_defconfig +++ b/configs/armadeus_apf27_defconfig @@ -4,8 +4,8 @@ BR2_arm926t=y # Lock down headers to avoid breaking with new defaults BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.13.2" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y +BR2_DEFAULT_KERNEL_VERSION="3.18.6" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y # System BR2_TARGET_GENERIC_HOSTNAME="apf27" @@ -21,9 +21,9 @@ BR2_TARGET_ROOTFS_UBI=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-3.13.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-3.18.config" BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev" diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig deleted file mode 100644 index d410f5b5a6..0000000000 --- a/configs/atngw100_defconfig +++ /dev/null @@ -1,35 +0,0 @@ -# AVR32 is deprecated -BR2_DEPRECATED=y - -# Architecture -BR2_avr32=y - -# Lock down kernel headers version, to match the kernel version used -# below. -BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.9.11" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y - -# Filesystems -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y -BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x1000 -BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000 -BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y -BR2_TARGET_ROOTFS_JFFS2_BE=y -BR2_TARGET_ROOTFS_TAR=y -BR2_TARGET_ROOTFS_TAR_NONE=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="atngw100" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09" - -# Kernel. Locked to 3.9.x, because 3.10.x fails to build with -# relocation truncated to fit: R_AVR32_16N_PCREL against symbol -# `_ctype' -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11" -BR2_LINUX_KERNEL_DEFCONFIG="atngw100" diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig deleted file mode 100644 index 0e17e36dc9..0000000000 --- a/configs/atstk100x_defconfig +++ /dev/null @@ -1,26 +0,0 @@ -# AVR32 is deprecated -BR2_DEPRECATED=y - -# Architecture -BR2_avr32=y - -# Lock to same version as kernel -BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.9.11" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y - -# U-Boot -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="atstk1002" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="atstk1002" - -# Filesystem -BR2_TARGET_ROOTFS_TAR=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig new file mode 100644 index 0000000000..b523a4ac0e --- /dev/null +++ b/configs/raspberrypi2_defconfig @@ -0,0 +1,25 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_TARGET_GENERIC_GETTY_PORT="tty1" + +# Lock to 3.19 headers as the RPi2 kernel is based off the 3.19 branch +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.19" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="23c76b7f608e51258c6fca02aebeb5d588583149" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" +BR2_LINUX_KERNEL_ZIMAGE=y + +# Install the DTB files, as the RPi2 uses the Device Tree +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS=y |