Commit 50ce7ffb authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next' 



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents 9b390454 cb08d7b0

Makefile

+18 −13
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#--------------------------------------------------------------



# Set and export the version string

export BR2_VERSION:=2013.11

export BR2_VERSION:=2014.02-git



# Check for minimal make version (note: this check will break at make 10.x)

MIN_MAKE_VERSION=3.81
@@ -108,10 +108,14 @@ TARGET_DIR:=$(BASE_DIR)/target 
HOST_DIR:=$(BASE_DIR)/host



LEGAL_INFO_DIR=$(BASE_DIR)/legal-info

REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources

LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses

LEGAL_MANIFEST_CSV=$(LEGAL_INFO_DIR)/manifest.csv

LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt

REDIST_SOURCES_DIR_TARGET=$(LEGAL_INFO_DIR)/sources

REDIST_SOURCES_DIR_HOST=$(LEGAL_INFO_DIR)/host-sources

LICENSE_FILES_DIR_TARGET=$(LEGAL_INFO_DIR)/licenses

LICENSE_FILES_DIR_HOST=$(LEGAL_INFO_DIR)/host-licenses

LEGAL_MANIFEST_CSV_TARGET=$(LEGAL_INFO_DIR)/manifest.csv

LEGAL_MANIFEST_CSV_HOST=$(LEGAL_INFO_DIR)/host-manifest.csv

LEGAL_LICENSES_TXT_TARGET=$(LEGAL_INFO_DIR)/licenses.txt

LEGAL_LICENSES_TXT_HOST=$(LEGAL_INFO_DIR)/host-licenses.txt

LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings

LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
@@ -401,7 +405,7 @@ world: $(BASE_TARGETS) $(TARGETS_ALL) 
# dependencies anywhere else

#

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

$(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR):

$(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST):

	@mkdir -p $@



# We make a symlink lib32->lib or lib64->lib as appropriate
@@ -513,7 +517,7 @@ endif 


	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \

		$(call MESSAGE,"Executing post-build script $(s)"); \

		$(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

		$(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))



ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)

LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
@@ -559,7 +563,7 @@ endif 
target-post-image:

	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \

		$(call MESSAGE,"Executing post-image script $(s)"); \

		$(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

		$(USER_HOOKS_EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))



toolchain-eclipse-register:

	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
@@ -574,15 +578,16 @@ legal-info-clean: 


legal-info-prepare: $(LEGAL_INFO_DIR)

	@$(call MESSAGE,"Collecting legal info")

	@$(call legal-license-file,buildroot,COPYING,COPYING)

	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE)

	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved)

	@$(call legal-license-file,buildroot,COPYING,COPYING,HOST)

	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,TARGET)

	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,HOST)

	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved,HOST)

	@$(call legal-warning,the Buildroot source code has not been saved)

	@$(call legal-warning,the toolchain has not been saved)

	@cp $(BUILDROOT_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config



legal-info: dirs legal-info-clean legal-info-prepare $(REDIST_SOURCES_DIR) \

		$(TARGETS_LEGAL_INFO)

legal-info: dirs legal-info-clean legal-info-prepare $(TARGETS_LEGAL_INFO) \

		$(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST)

	@cat support/legal-info/README.header >>$(LEGAL_REPORT)

	@if [ -r $(LEGAL_WARNINGS) ]; then \

		cat support/legal-info/README.warnings-header \

arch/Config.in.sparc

+0 −6
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ config BR2_ENDIAN 


config BR2_GCC_TARGET_TUNE

	default "v8"		if BR2_sparc_v8

	default "v9"		if BR2_sparc_v9

	default "v9"		if BR2_sparc_v9a

	default "v9"		if BR2_sparc_v9b

	default "ultrasparc"	if BR2_sparc_ultrasparc

	default "ultrasparc3"	if BR2_sparc_ultrasparc3

	default "niagara"	if BR2_sparc_niagara



config BR2_GCC_TARGET_CPU

	default "sparchfleon"	if BR2_sparc_sparchfleon

board/qemu/mips64-malta/linux-3.12.config

+8 −27
Original line number Diff line number Diff line 
CONFIG_MIPS_MALTA=y

CONFIG_CPU_MIPS64_R1=y

CONFIG_64BIT=y

CONFIG_64BIT_PHYS_ADDR=y

CONFIG_MIPS_MT_SMP=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_RELAY=y

CONFIG_NAMESPACES=y

CONFIG_UTS_NS=y

CONFIG_IPC_NS=y

CONFIG_PID_NS=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_RELAY=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_MODULES=y
@@ -26,7 +19,9 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PCI=y

CONFIG_PM=y

CONFIG_MIPS32_COMPAT=y

CONFIG_MIPS32_O32=y

CONFIG_MIPS32_N32=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -40,39 +35,25 @@ CONFIG_IP_PNP=y 
# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_MISC_DEVICES is not set

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_IDE_GENERIC=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_NET_PCI=y

CONFIG_PCNET32=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO_I8042 is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

CONFIG_FB=y

CONFIG_FB_CIRRUS=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_QUOTA=y

CONFIG_EXT4_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y
 
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

board/qemu/mips64-malta/readme.txt

+1 −4
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ Run the emulation with: 
 qemu-system-mips64 -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"



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

graphical window is the framebuffer. No keyboard support has been

enabled.



This configuration is known to be flaky.

graphical window is the framebuffer.



Tested with QEMU 1.6.1

board/qemu/mips64el-malta/linux-3.12.config

0 → 100644
+60 −0
Original line number Diff line number Diff line 
CONFIG_MIPS_MALTA=y

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_CPU_MIPS64_R1=y

CONFIG_64BIT=y

CONFIG_MIPS_MT_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_NAMESPACES=y

CONFIG_RELAY=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PCI=y

CONFIG_MIPS32_COMPAT=y

CONFIG_MIPS32_O32=y

CONFIG_MIPS32_N32=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_IDE_GENERIC=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_NETDEVICES=y

CONFIG_PCNET32=y

# CONFIG_WLAN is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_CIRRUS=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT4_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y