Commit 9545eb61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'unicore32' of git://github.com/gxt/linux 

* 'unicore32' of git://github.com/gxt/linux:
  unicore32, exec: remove redundant set_fs(USER_DS)
  unicore32: Fix typo 'PUV3_I2C'
  unicore32: drop unused Kconfig symbols
  rtc: rtc-puv3: Add __devinit and __devexit markers for probe and remove
  arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS
  unicore32: fix build error for find bitops
parents 148b00b6 ed96dfbc

arch/unicore32/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -237,13 +237,13 @@ menu "PKUnity NetBook-0916 Features" 


config I2C_BATTERY_BQ27200

	tristate "I2C Battery BQ27200 Support"

	select PUV3_I2C

	select I2C_PUV3

	select POWER_SUPPLY

	select BATTERY_BQ27x00



config I2C_EEPROM_AT24

	tristate "I2C EEPROMs AT24 support"

	select PUV3_I2C

	select I2C_PUV3

	select MISC_DEVICES

	select EEPROM_AT24

arch/unicore32/Kconfig.debug

+0 −14
Original line number Diff line number Diff line
@@ -44,18 +44,4 @@ config DEBUG_OCD 
	  Say Y here if you want the debug print routines to direct their

	  output to the UniCore On-Chip-Debugger channel using CP #1.



config DEBUG_OCD_BREAKPOINT

	bool "Breakpoint support via On-Chip-Debugger"

	depends on DEBUG_OCD



config DEBUG_UART

	int "Kernel low-level debugging messages via serial port"

	depends on DEBUG_LL

	range 0 1

	default "0"

	help

	  Choice for UART for kernel low-level using PKUnity UARTS,

	  should be between zero and one. The port must have been

	  initialised by the boot-loader before use.



endmenu

arch/unicore32/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
# Copyright (C) 2001~2010 GUAN Xue-tao

#



EXTRA_CFLAGS	:= -fpic -fno-builtin

EXTRA_AFLAGS	:= -Wa,-march=all

ccflags-y	:= -fpic -fno-builtin

asflags-y	:= -Wa,-march=all



OBJS		:= misc.o

arch/unicore32/include/asm/bitops.h

+6 −6
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ 
#ifndef __UNICORE_BITOPS_H__

#define __UNICORE_BITOPS_H__



#define find_next_bit		__uc32_find_next_bit

#define find_next_zero_bit	__uc32_find_next_zero_bit



#define find_first_bit		__uc32_find_first_bit

#define find_first_zero_bit	__uc32_find_first_zero_bit



#define _ASM_GENERIC_BITOPS_FLS_H_

#define _ASM_GENERIC_BITOPS___FLS_H_

#define _ASM_GENERIC_BITOPS_FFS_H_
@@ -44,4 +38,10 @@ static inline int fls(int x) 


#include <asm-generic/bitops.h>



/* following definitions: to avoid using codes in lib/find_*.c */

#define find_next_bit		find_next_bit

#define find_next_zero_bit	find_next_zero_bit

#define find_first_bit		find_first_bit

#define find_first_zero_bit	find_first_zero_bit



#endif /* __UNICORE_BITOPS_H__ */

arch/unicore32/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct thread_struct { 
#define start_thread(regs, pc, sp)					\

({									\

	unsigned long *stack = (unsigned long *)sp;			\

	set_fs(USER_DS);						\

	memset(regs->uregs, 0, sizeof(regs->uregs));			\

	regs->UCreg_asr = USER_MODE;					\

	regs->UCreg_pc = pc & ~1;	/* pc */                        \

CRA Git | Maintained and supported by SUSTech CRA and CCSE