Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf4e948 authored by Russell King's avatar Russell King
Browse files

Merge branch 'misc' into for-linus 

Conflicts:
	arch/arm/mach-integrator/integrator_ap.c
parents 06afb1a0 eb047454

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ config ARM_PATCH_PHYS_VIRT 
	  you need to shrink the kernel to the minimal size.





config GENERIC_BUG

	def_bool y

	depends on BUG



source "init/Kconfig"



source "kernel/Kconfig.freezer"

arch/arm/boot/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -78,7 +78,16 @@ endif 


$(obj)/uImage: STARTADDR=$(LOADADDR)



check_for_multiple_loadaddr = \

if [ $(words $(LOADADDR)) -gt 1 ]; then \

	echo 'multiple load addresses: $(LOADADDR)'; \

	echo 'This is incompatible with uImages'; \

	echo 'Specify LOADADDR on the commandline to build an uImage'; \

	false; \

fi



$(obj)/uImage:	$(obj)/zImage FORCE

	@$(check_for_multiple_loadaddr)

	$(call if_changed,uimage)

	@echo '  Image $@ is ready'

arch/arm/boot/compressed/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -139,8 +139,16 @@ bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \ 
  ( echo "following symbols must have non local/private scope:" >&2; \

    echo "$$bad_syms" >&2; rm -f $@; false )



check_for_multiple_zreladdr = \

if [ $(words $(ZRELADDR)) -gt 1 -a "$(CONFIG_AUTO_ZRELADDR)" = "" ]; then \

	echo 'multiple zreladdrs: $(ZRELADDR)'; \

	echo 'This needs CONFIG_AUTO_ZRELADDR to be set'; \

	false; \

fi



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \

	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE

	@$(check_for_multiple_zreladdr)

	$(call if_changed,ld)

	@$(check_for_bad_syms)

arch/arm/common/pl330.c

+1 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,7 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op) 


		/* Start the next */

	case PL330_OP_START:

		if (!_start(thrd))

		if (!_thrd_active(thrd) && !_start(thrd))

			ret = -EIO;

		break;

arch/arm/configs/integrator_defconfig

+15 −4
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_TINY_RCU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -8,20 +9,29 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_ARCH_INTEGRATOR=y

CONFIG_ARCH_INTEGRATOR_AP=y

CONFIG_ARCH_INTEGRATOR_CP=y

CONFIG_CPU_ARM720T=y

CONFIG_CPU_ARM920T=y

CONFIG_CPU_ARM922T=y

CONFIG_CPU_ARM926T=y

CONFIG_CPU_ARM1020=y

CONFIG_CPU_ARM1022=y

CONFIG_CPU_ARM1026=y

CONFIG_PCI=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyAM0,38400n8 root=/dev/nfs ip=bootp mem=32M"

CONFIG_CMDLINE="console=ttyAM0,38400n8 root=/dev/nfs ip=bootp"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -32,7 +42,6 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_IP_PNP_BOOTP=y

# CONFIG_IPV6 is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_AFS_PARTS=y

CONFIG_MTD_CHAR=y
@@ -40,6 +49,7 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -56,6 +66,8 @@ CONFIG_FB_MODE_HELPERS=y 
CONFIG_FB_MATROX=y

CONFIG_FB_MATROX_MILLENIUM=y

CONFIG_FB_MATROX_MYSTIQUE=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PL030=y

CONFIG_EXT2_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y
@@ -68,4 +80,3 @@ CONFIG_NFSD_V3=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y
 
CONFIG_DEBUG_ERRORS=y