Commit 28cd1ed3 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next' 



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents 13222c07 2dfabd10

Config.in

+4 −0
Original line number Diff line number Diff line
@@ -365,6 +365,10 @@ config BR2_DEPRECATED_SINCE_2016_02 
	bool

	default y



config BR2_DEPRECATED_SINCE_2016_05

	bool

	default y



endif



config BR2_ENABLE_DEBUG

Config.in.legacy

+52 −0
Original line number Diff line number Diff line
@@ -142,6 +142,58 @@ comment "build, or run, in unpredictable ways. " 
comment "----------------------------------------------------"

endif



###############################################################################

comment "Legacy options removed in 2016.05"



config BR2_PACKAGE_KODI_WAVPACK

	bool "wavpack"

	select BR2_LEGACY

	help

	  wavpack support was removed in favour of ffmpeg:

	  https://github.com/xbmc/xbmc/commit/7916902c9e6f7a523265594f3ad7f921f93f1cd4



config BR2_PACKAGE_KODI_RSXS

	bool "rsxs support in Kodi was moved to an addon"

	select BR2_LEGACY

	select BR2_PACKAGE_KODI_SCREENSAVER_RSXS

	help

	  rsxs support in Kodi was moved to an addon



config BR2_PACKAGE_KODI_GOOM

	bool "Goom support in Kodi was moved to an addon"

	select BR2_LEGACY

	select BR2_PACKAGE_KODI_VISUALISATION_GOOM

	help

	  Goom support in Kodi was moved to an addon



config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS

	bool "systemd all extras option has been removed"

	select BR2_LEGACY

	select BR2_PACKAGE_XZ

	select BR2_PACKAGE_LIBGCRYPT

	help

	  The systemd option to enable "all extras" has been

	  removed. To get the same features, the libgcrypt and xz

	  package should now be enabled.



config BR2_GCC_VERSION_4_5_X

	bool "gcc 4.5.x has been removed"

	select BR2_LEGACY

	help

	  The 4.5.x version of gcc has been removed. Use a newer

	  version instead.



config BR2_PACKAGE_SQLITE_READLINE

	bool "command-line editing support was updated"

	select BR2_PACKAGE_NCURSES

	select BR2_PACKAGE_READLINE

	select BR2_LEGACY

	help

	  This option was removed in favour of the sqlite package

	  deciding itself depending on the enabled packages whether

	  command-line editing should be enabled, it also also takes

	  libedit into account.



###############################################################################

comment "Legacy options removed in 2016.02"

arch/Config.in.arm

+9 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@ config BR2_cortex_a15 
	select BR2_ARM_CPU_HAS_THUMB2

	select BR2_ARM_CPU_ARMV7A

	select BR2_ARCH_HAS_MMU_OPTIONAL

config BR2_cortex_a17

	bool "cortex-A17"

	select BR2_ARM_CPU_HAS_ARM

	select BR2_ARM_CPU_HAS_NEON

	select BR2_ARM_CPU_HAS_VFPV4

	select BR2_ARM_CPU_HAS_THUMB2

	select BR2_ARM_CPU_ARMV7A

	select BR2_ARCH_HAS_MMU_OPTIONAL

config BR2_cortex_m3

	bool "cortex-M3"

	select BR2_ARM_CPU_HAS_THUMB
@@ -442,6 +450,7 @@ config BR2_GCC_TARGET_CPU 
	default "cortex-a9"	if BR2_cortex_a9

	default "cortex-a12"	if BR2_cortex_a12

	default "cortex-a15"	if BR2_cortex_a15

	default "cortex-a17"	if BR2_cortex_a17

	default "cortex-m3"	if BR2_cortex_m3

	default "fa526"		if BR2_fa526

	default "marvell-pj4"	if BR2_pj4

board/arm/foundation-v8/readme.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. 


First, one has to download the AArch64 software simulator from:



  https://silver.arm.com/download/download.tm?pv=2482590

  https://silver.arm.com/download/download.tm?pv=2663527



Then, use the arm_foundationv8_defconfig configuration to build your

Buildroot system.



Finally, boot your system with:



 ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.1/Foundation_Platform \

 ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.7/Foundation_Platform \

    --image output/images/linux-system.axf \

    --block-device output/images/rootfs.ext2 \

    --network=nat

board/firefly/firefly-rk3288/extlinux.conf

0 → 100644
+6 −0
Original line number Diff line number Diff line 
default firefly-rk3288



label firefly-rk3288

kernel /boot/uImage

devicetree /boot/rk3288-firefly.dtb

append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait