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

Commit 5ebe5500 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 

* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
  unicore32: using generic-y format for one line asm-generic files
  unicore32: change PERCPU to PERCPU_SECTION
  unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)
  unicore32: change zImage physical address, though it's PIC codes
  unicore32: move rtc-puv3.c to drivers/rtc directory
parents 29cf519e 62b62c5c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4945,6 +4945,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi 
F:	drivers/input/serio/i8042-unicore32io.h

F:	drivers/i2c/busses/i2c-puv3.c

F:	drivers/video/fb-puv3.c

F:	drivers/rtc/rtc-puv3.c



PMC SIERRA MaxRAID DRIVER

M:	Anil Ravindranath <anil_ravindranath@pmc-sierra.com>

arch/unicore32/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -231,10 +231,6 @@ config PUV3_PWM 
	help

	  Enable support for NB0916 PWM controllers



config PUV3_RTC

	tristate "PKUnity v3 RTC Support"

	depends on !ARCH_FPGA



if PUV3_NB0916



menu "PKUnity NetBook-0916 Features"

arch/unicore32/Makefile

+2 −36
Original line number Diff line number Diff line
@@ -40,42 +40,10 @@ core-y += arch/unicore32/mm/ 


libs-y			+= arch/unicore32/lib/



ASM_GENERATED_DIR	:= $(srctree)/arch/unicore32/include/generated

LINUXINCLUDE		+= -I$(ASM_GENERATED_DIR)



ASM_GENERIC_HEADERS	:= atomic.h auxvec.h

ASM_GENERIC_HEADERS	+= bitsperlong.h bug.h bugs.h

ASM_GENERIC_HEADERS	+= cputime.h current.h

ASM_GENERIC_HEADERS	+= device.h div64.h

ASM_GENERIC_HEADERS	+= emergency-restart.h errno.h

ASM_GENERIC_HEADERS	+= fb.h fcntl.h ftrace.h futex.h

ASM_GENERIC_HEADERS	+= hardirq.h hw_irq.h

ASM_GENERIC_HEADERS	+= ioctl.h ioctls.h ipcbuf.h irq_regs.h

ASM_GENERIC_HEADERS	+= kdebug.h kmap_types.h

ASM_GENERIC_HEADERS	+= local.h

ASM_GENERIC_HEADERS	+= mman.h module.h msgbuf.h

ASM_GENERIC_HEADERS	+= param.h parport.h percpu.h poll.h posix_types.h

ASM_GENERIC_HEADERS	+= resource.h

ASM_GENERIC_HEADERS	+= scatterlist.h sections.h segment.h sembuf.h serial.h

ASM_GENERIC_HEADERS	+= setup.h shmbuf.h shmparam.h

ASM_GENERIC_HEADERS	+= siginfo.h signal.h sizes.h

ASM_GENERIC_HEADERS	+= socket.h sockios.h stat.h statfs.h swab.h syscalls.h

ASM_GENERIC_HEADERS	+= termbits.h termios.h topology.h types.h

ASM_GENERIC_HEADERS	+= ucontext.h unaligned.h user.h

ASM_GENERIC_HEADERS	+= vga.h

ASM_GENERIC_HEADERS	+= xor.h



archprepare:

ifneq ($(ASM_GENERATED_DIR), $(wildcard $(ASM_GENERATED_DIR)))

	$(Q)mkdir -p $(ASM_GENERATED_DIR)/asm

	$(Q)$(foreach a, $(ASM_GENERIC_HEADERS),	\

		echo '#include <asm-generic/$a>'	\

			> $(ASM_GENERATED_DIR)/asm/$a; )

endif



boot			:= arch/unicore32/boot



# Default target when executing plain make

# Default defconfig and target when executing plain make

KBUILD_DEFCONFIG	:= $(ARCH)_defconfig

KBUILD_IMAGE		:= zImage



all:	$(KBUILD_IMAGE)
@@ -83,8 +51,6 @@ all: $(KBUILD_IMAGE) 
zImage Image uImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



MRPROPER_DIRS		+= $(ASM_GENERATED_DIR)



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/unicore32/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \ 
# We now have a PIC decompressor implementation.  Decompressors running

# from RAM should not define ZTEXTADDR.  Decompressors running directly

# from ROM or Flash must define ZTEXTADDR (preferably via the config)

ZTEXTADDR	:= 0

ZTEXTADDR	:= 0x03000000

ZBSSADDR	:= ALIGN(4)



SEDFLAGS_lds	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/

arch/unicore32/configs/debug_defconfig→arch/unicore32/configs/unicore32_defconfig

+4 −4
Original line number Diff line number Diff line 
### General setup

CONFIG_EXPERIMENTAL=y

CONFIG_LOCALVERSION="-debug"

CONFIG_LOCALVERSION="-unicore32"

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -64,7 +64,6 @@ CONFIG_I2C_BATTERY_BQ27200=n 
CONFIG_I2C_EEPROM_AT24=n

CONFIG_LCD_BACKLIGHT=n



CONFIG_PUV3_RTC=y

CONFIG_PUV3_UMAL=y

CONFIG_PUV3_MUSB=n

CONFIG_PUV3_AC97=n
@@ -167,8 +166,9 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y 
CONFIG_LEDS_TRIGGER_HEARTBEAT=y



#	Real Time Clock

CONFIG_RTC_LIB=m

CONFIG_RTC_CLASS=m

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PUV3=y



### File systems

CONFIG_EXT2_FS=m