sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/misc'

This commit is contained in:
Sascha Hauer 2012-12-07 16:43:15 +01:00
parent 36a886a9f7 c385e034e5
commit 86ee7f112f
34 changed files with 320 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Makefile
View File

@ -1166,115 +1166,10 @@ htmldocs: Doxyfile.version
# Generate tags for editors
# ---------------------------------------------------------------------------
quiet_cmd_tags = GEN $@
cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
#We want __srctree to totally vanish out when KBUILD_OUTPUT is not set
#(which is the most common case IMHO) to avoid unneeded clutter in the big tags file.
#Adding $(srctree) adds about 20M on i386 to the size of the output file!
ifeq ($(src),$(obj))
__srctree =
else
__srctree = $(srctree)/
endif
ifeq ($(ALLSOURCE_ARCHS),)
ifeq ($(ARCH),um)
ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH)
else
ALLINCLUDE_ARCHS := $(ARCH)
endif
else
#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour.
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
endif
ALLSOURCE_ARCHS := $(ARCH)
define find-sources
( find $(__srctree) $(RCS_FIND_IGNORE) \
\( -name include -o -name arch \) -prune -o \
-name $1 -print; \
for ARCH in $(ALLSOURCE_ARCHS) ; do \
find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \
-name $1 -print; \
done ; \
find $(__srctree)include $(RCS_FIND_IGNORE) \
\( -name config -o -name 'asm-*' \) -prune \
-o -name $1 -print; \
for ARCH in $(ALLINCLUDE_ARCHS) ; do \
test -e $(__srctree)include/asm-$${arch} && \
find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
-name $1 -print; \
test -e $(__srctree)arch/$${arch}/include/asm && \
find $(__srctree)arch/$${arch}/include/asm $(RCS_FIND_IGNORE) \
-name $1 -print; \
done ; \
find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \
-name $1 -print )
endef
define all-sources
$(call find-sources,'*.[chS]')
endef
define all-kconfigs
$(call find-sources,'Kconfig*')
endef
define all-defconfigs
$(call find-sources,'defconfig')
endef
define xtags
if $1 --version 2>&1 | grep -iq exuberant; then \
$(all-sources) | xargs $1 -a \
-I __initdata,__exitdata,__acquires,__releases \
-I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
--extra=+f --c-kinds=+px \
--regex-asm='/ENTRY\(([^)]*)\).*/\1/'; \
$(all-kconfigs) | xargs $1 -a \
--langdef=kconfig \
--language-force=kconfig \
--regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \
$(all-defconfigs) | xargs -r $1 -a \
--langdef=dotconfig \
--language-force=dotconfig \
--regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'; \
elif $1 --version 2>&1 | grep -iq emacs; then \
$(all-sources) | xargs $1 -a; \
$(all-kconfigs) | xargs $1 -a \
--regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \
$(all-defconfigs) | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
else \
$(all-sources) | xargs $1 -a; \
fi
endef
quiet_cmd_cscope-file = FILELST cscope.files
cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
quiet_cmd_cscope = MAKE cscope.out
cmd_cscope = cscope -b
cscope: FORCE
$(call cmd,cscope-file)
$(call cmd,cscope)
quiet_cmd_TAGS = MAKE $@
define cmd_TAGS
rm -f $@; \
$(call xtags,etags)
endef
TAGS: FORCE
$(call cmd,TAGS)
quiet_cmd_tags = MAKE $@
define cmd_tags
rm -f $@; \
$(call xtags,ctags)
endef
tags: FORCE
tags TAGS cscope: FORCE
$(call cmd,tags)

2
arch/arm/boards/beagle/board.c
View File

@ -23,8 +23,6 @@
/**
* @page ti_beagle Texas Instruments Beagle Board
*
* FileName: arch/arm/boards/omap/board-beagle.c
*
* Beagle Board from Texas Instruments as described here:
* http://www.beagleboard.org
*

2
arch/arm/boards/omap343xdsp/board.c
View File

@ -23,8 +23,6 @@
/**
* @page ti_SDP3430 Texas Instruments SDP3430
*
* FileName: arch/arm/boards/omap/board-sdp343x.c
*
* SDP3430 from Texas Instruments as described here:
* http://www.ti.com/omap3430_devplatform
* This file provides initialization in two stages:

2
arch/arm/boards/omap3evm/board.c
View File

@ -2,8 +2,6 @@
* @file
* @brief Board Initialization routines for OMAP3EVM.
*
* FileName: arch/arm/boards/omap/board-omap3evm.c
*
* This board is based on OMAP3530.
* More on OMAP3530 (including documentation can be found here):
* http://focus.ti.com/docs/prod/folders/print/omap3530.html

7
arch/arm/boards/phycard-a-l1/pca-a-l1.c
View File

@ -2,8 +2,6 @@
* @file
* @brief Board Initialization routines for the phyCARD-A-L1
*
* FileName: arch/arm/boards/phycard-a-l1/pca-a-l1.c
*
* This board is based on OMAP3530.
* More on OMAP3530 (including documentation can be found here):
* http://focus.ti.com/docs/prod/folders/print/omap3530.html
@ -22,9 +20,7 @@
* @li serial @ref serial_ns16550.c driver device definition
*
* Originally from arch/arm/boards/omap/board-beagle.c
*/
/*
*
* Copyright (C) 2011 Phytec Messtechnik GmbH - http://www.phytec.de/
* Juergen Kilb <j.kilb@phytec.de>
*
@ -40,7 +36,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <common.h>

7
arch/arm/boards/phycard-a-l1/pca-a-l1.h
View File

@ -2,11 +2,8 @@
* @file
* @brief exported generic APIs which various board files implement
*
* FileName: arch/arm/boards/phycard-a-l1/board.h
*
* This file will not contain any board specific implementations.
*/
/*
*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Raghavendra KH <r-khandenahally@ti.com>
@ -20,8 +17,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __BOARD_OMAP_H_
#define __BOARD_OMAP_H_

10
arch/arm/mach-omap/Kconfig
View File

@ -75,7 +75,7 @@ config OMAP_BUILD_SPI
bool
help
Say Y here if you want to build an barebox.spi image as used
on the AM35xx chips when booting form SPI NOR flash.
on the AM35xx chips when booting from SPI NOR flash.
config ARCH_TEXT_BASE
hex
@ -89,7 +89,7 @@ config OMAP4_USBBOOT
help
Say Y here if you want to be able to boot an OMAP4 cpu from USB.
You need the utility program omap4_usbboot to boot from USB.
Please read oamp4_usb_booting.txt for more information.
Please read omap4_usb_booting.txt for more information.
config BOARDINFO
default "Archos G9" if MACH_ARCHOSG9
@ -115,14 +115,14 @@ config MACH_BEAGLE
select HAVE_NOSHELL
select HAVE_DEFAULT_ENVIRONMENT_NEW
depends on ARCH_OMAP3
help
help
Say Y here if you are using Beagle Board
config MACH_OMAP3EVM
bool "Texas Instrument's OMAP3 EVM"
select HAVE_NOSHELL
depends on ARCH_OMAP3
help
help
Say Y here if you are using OMAP3EVM
config MACH_PANDA
@ -155,7 +155,7 @@ config MACH_PCAAL1
bool "Phytec phyCARD-A-L1"
select HAVE_NOSHELL
depends on ARCH_OMAP3
help
help
Say Y here if you are using a phyCARD-A-L1 PCA-A-L1
config MACH_PCAAXL2

6
arch/arm/mach-omap/devices-gpmc-nand.c
View File

@ -2,10 +2,6 @@
* @file
* @brief GPMC specific NAND devices
*
* FileName: arch/arm/boards/omap/devices-gpmc-nand.c
*
*/
/*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -19,8 +15,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <common.h>
#include <console.h>
#include <init.h>

6
arch/arm/mach-omap/gpmc.c
View File

@ -2,12 +2,8 @@
* @file
* @brief Provide Generic GPMC configuration option
*
* FileName: arch/arm/mach-omap/gpmc.c
*
* This file contains the generic GPMC implementation
*
*/
/*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -21,8 +17,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <common.h>
#include <clock.h>
#include <init.h>

7
arch/arm/mach-omap/include/mach/clocks.h
View File

@ -2,13 +2,10 @@
* @file
* @brief Generic Clock wrapper header.
*
* FileName: include/asm-arm/arch-omap/clocks.h
*
* This includes each of the architecture Clock definitions under it.
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -22,8 +19,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __OMAP_CLOCKS_H_
#define __OMAP_CLOCKS_H_

6
arch/arm/mach-omap/include/mach/control.h
View File

@ -2,13 +2,10 @@
* @file
* @brief This file contains the Control register defines
*
* FileName: include/asm-arm/arch-omap/control.h
*
* Originally from Linux kernel:
* http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
* include/asm-arm/arch-omap/omap34xx.h
*/
/*
*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -25,7 +22,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP_CONTROL_H

5
arch/arm/mach-omap/include/mach/gpmc.h
View File

@ -2,15 +2,11 @@
* @file
* @brief This file contains the GPMC's generic definitions
*
* FileName: include/asm-arm/arch-omap/gpmc.h
*
* OMAP's General Purpose Memory Controller(GPMC) provides features
* allowing us to communicate with memory devices such as NOR, NAND,
* OneNAND, SRAM etc.. This file defines certain generic parameters
* allowing us to configure the same painlessly.
*
*/
/*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -31,7 +27,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP_GPMC_H

4
arch/arm/mach-omap/include/mach/gpmc_nand.h
View File

@ -2,14 +2,10 @@
* @file
* @brief This file contains exported structure for NAND
*
* FileName: include/asm-arm/arch-omap/gpmc_nand.h
*
* OMAP's General Purpose Memory Controller (GPMC) has a NAND controller
* embedded. this file provides the platform data structure required to
* hook on to it.
*
*/
/*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>

6
arch/arm/mach-omap/include/mach/intc.h
View File

@ -2,13 +2,10 @@
* @file
* @brief This file contains the Interrupt controller register defines
*
* FileName: include/asm-arm/arch-omap/intc.h
*
* Originally from Linux kernel:
* http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
* include/asm-arm/arch-omap/omap34xx.h
*/
/*
*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -25,7 +22,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP_INTC_H

6
arch/arm/mach-omap/include/mach/omap3-clock.h
View File

@ -2,12 +2,8 @@
* @file
* @brief Contains the PRM and CM definitions
*
* FileName: include/asm-arm/arch-omap/omap3-clock.h
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*
*/
/*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -21,8 +17,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef _OMAP343X_CLOCKS_H_
#define _OMAP343X_CLOCKS_H_

7
arch/arm/mach-omap/include/mach/omap3-mux.h
View File

@ -2,15 +2,12 @@
* @file
* @brief Mux Configuration Register defines for OMAP3
*
* FileName: include/asm-arm/arch-omap/omap3-mux.h
*
* This file defines the various Pin Mux registers
* @see include/asm-arm/arch-omap/control.h
* The @ref MUX_VAL macro uses the defines from this file
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Syed Mohammed Khasim <x0khasim@ti.com>
@ -24,8 +21,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef _ASM_ARCH_OMAP3_MUX_H_
#define _ASM_ARCH_OMAP3_MUX_H_

6
arch/arm/mach-omap/include/mach/omap3-silicon.h
View File

@ -4,15 +4,12 @@
* the TI OMAP34XX. For more info on OMAP34XX,
* See http://focus.ti.com/pdfs/wtbu/swpu114g.pdf
*
* FileName: include/asm-arm/arch-omap/omap3-silicon.h
*
* OMAP34XX base address defines go here.
*
* Originally from Linux kernel:
* http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
* include/asm-arm/arch-omap/omap3-silicon.h
*/
/*
*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -29,7 +26,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP3_H

6
arch/arm/mach-omap/include/mach/omap3-smx.h
View File

@ -2,13 +2,10 @@
* @file
* @brief This file contains the SMX specific register definitions
*
* FileName: include/asm-arm/arch-omap/omap3-smx.h
*
* Originally from Linux kernel:
* http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
* include/asm-arm/arch-omap/omap34xx.h
*/
/*
*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -25,7 +22,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP_SMX_H

5
arch/arm/mach-omap/include/mach/omap_hsmmc.h
View File

@ -2,13 +2,10 @@
* @file
* @brief This file contains exported structure for OMAP hsmmc
*
* FileName: include/asm-arm/arch-omap/omap_hsmmc.h
*
* OMAP3 and OMAP4 has a MMC/SD controller embedded.
* This file provides the platform data structure required to
* addapt to platform specialities.
*/
/*
*
* (C) Copyright 2011
* Phytec Messtechnik GmbH, <www.phytec.de>
* Juergen Kilb <j.kilb@phytec.de>

7
arch/arm/mach-omap/include/mach/sdrc.h
View File

@ -2,11 +2,8 @@
* @file
* @brief This file contains the SDRC specific register definitions
*
* FileName: include/asm-arm/arch-omap/sdrc.h
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
*
@ -22,8 +19,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
*/
#ifndef _ASM_ARCH_SDRC_H

6
arch/arm/mach-omap/include/mach/sys_info.h
View File

@ -3,13 +3,10 @@
* @brief This file defines the macros apis which are useful for most OMAP
* platforms.
*
* FileName: include/asm-arm/arch-omap/sys_info.h
*
* These are implemented by the System specific code in omapX-generic.c
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -23,7 +20,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_SYS_INFO_H_

7
arch/arm/mach-omap/include/mach/syslib.h
View File

@ -2,13 +2,10 @@
* @file
* @brief These Apis are OMAP independent support functions
*
* FileName: include/asm-arm/arch-omap/syslib.h
*
* Implemented by arch/arm/mach-omap/syslib.c
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2004-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -22,8 +19,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP_SYSLIB_H_
#define __ASM_ARCH_OMAP_SYSLIB_H_
#include <io.h>

4
arch/arm/mach-omap/include/mach/timers.h
View File

@ -7,8 +7,6 @@
* Originally from Linux kernel:
* http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
*
*/
/*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -25,8 +23,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_GPT_H
#define __ASM_ARCH_GPT_H

6
arch/arm/mach-omap/include/mach/wdt.h
View File

@ -2,10 +2,6 @@
* @file
* @brief This file contains the Watchdog timer specific register definitions
*
* FileName: include/asm-arm/arch-omap/wdt.h
*
*/
/*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -19,8 +15,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_OMAP_WDT_H
#define __ASM_ARCH_OMAP_WDT_H

6
arch/arm/mach-omap/omap3_clock.c
View File

@ -2,8 +2,6 @@
* @file
* @brief OMAP DPLL and various clock configuration
*
* FileName: arch/arm/mach-omap/omap3_clock.c
*
* @ref prcm_init This is the second level clock init for PRCM as defined in
* clocks.h -- called from SRAM, or Flash (using temp SRAM stack).
*
@ -16,8 +14,7 @@
* should be used, functions cannot use global variables/switch constructs.
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -31,7 +28,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <common.h>

5
arch/arm/mach-omap/omap3_core.S
View File

@ -2,8 +2,6 @@
* @file
* @brief Provide Architecture level Initialization
*
* FileName: arch/arm/mach-omap/omap3_core.S
*
* This provides OMAP3 Architecture initialization. Among these,
* @li OMAP ROM Code is located in SRAM, we can piggy back on
* the same addresses
@ -12,8 +10,6 @@
* functions.
* @li Call architecture initialization function a_init
*
*/
/*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -27,7 +23,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <config.h>

7
arch/arm/mach-omap/omap3_generic.c
View File

@ -2,8 +2,6 @@
* @file
* @brief Provide Generic implementations for OMAP3 architecture
*
* FileName: arch/arm/mach-omap/omap3_generic.c
*
* This file contains the generic implementations of various OMAP3
* relevant functions
* For more info on OMAP34XX, see http://focus.ti.com/pdfs/wtbu/swpu114g.pdf
@ -12,8 +10,7 @@
* The implemented functions are present in sys_info.h
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -28,8 +25,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <common.h>
#include <init.h>
#include <io.h>

5
arch/arm/mach-omap/s32k_clksource.c
View File

@ -2,14 +2,10 @@
* @file
* @brief Provide @ref clocksource functionality for OMAP
*
* FileName: arch/arm/mach-omap/s32k_clksource.c
*
* @ref clocksource provides a neat architecture. all we do is
* To loop in with Sync 32Khz clock ticking away at 32768hz on OMAP.
* Sync 32Khz clock is an always ON clock.
*
*/
/*
* (C) Copyright 2008
* Texas Instruments, <www.ti.com>
* Nishanth Menon <x0nishan@ti.com>
@ -23,7 +19,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <common.h>

6
arch/arm/mach-omap/syslib.c
View File

@ -2,14 +2,11 @@
* @file
* @brief Provide OMAP independent utility APIs
*
* FileName: arch/arm/mach-omap/syslib.c
*
* Provide APIs which can be used from platform/architecture code
* to operate on
*
* Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
*/
/*
*
* (C) Copyright 2006-2008
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com>
@ -23,7 +20,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include <config.h>

13
common/password.c
View File

@ -66,11 +66,14 @@ int password(unsigned char *passwd, size_t length, int flags, int timeout)
case CTL_CH('h'):
case KEY_DEL7:
case KEY_DEL:
if (flags & STAR && pos > 0)
puts("\b \b");
*buf = '\0';
buf--;
pos--;
if (pos > 0) {
if (flags & STAR)
puts("\b \b");
*buf = '\0';
buf--;
pos--;
}
continue;
default:
if (pos < length - 1) {

7
drivers/eeprom/at25.c
View File

@ -232,15 +232,10 @@ static ssize_t at25_ee_write(struct cdev *cdev,
return written ? written : status;
}
static loff_t at25_ee_lseek(struct cdev *cdev, loff_t off)
{
return off;
}
static struct file_operations at25_fops = {
.read = at25_ee_read,
.write = at25_ee_write,
.lseek = at25_ee_lseek,
.lseek = dev_lseek_default,
};
static int at25_probe(struct device_d *dev)

11
drivers/watchdog/im28wd.c
View File

@ -82,6 +82,17 @@ static void __maybe_unused imx28_detect_reset_source(const struct imx28_wd *p)
if (reg & MXS_RTC_PERSISTENT0_EXT_RST) {
writel(MXS_RTC_PERSISTENT0_EXT_RST,
p->regs + MXS_RTC_PERSISTENT0 + MXS_RTC_CLR_ADDR);
/*
* if the RTC has woken up the SoC, additionally the ALARM_WAKE
* bit is set. This bit should have precedence, because it
* reports the real event, why we are here.
*/
if (reg & MXS_RTC_PERSISTENT0_ALARM_WAKE) {
writel(MXS_RTC_PERSISTENT0_ALARM_WAKE,
p->regs + MXS_RTC_PERSISTENT0 + MXS_RTC_CLR_ADDR);
set_reset_source(RESET_WKE);
return;
}
set_reset_source(RESET_POR);
return;
}

4
include/driver.h
View File

@ -410,11 +410,11 @@ extern struct list_head bus_list;
/* Iterate over all devices of a bus
*/
#define bus_for_each_device(bus, dev) list_for_each_entry(dev, &bus->device_list, bus_list)
#define bus_for_each_device(bus, dev) list_for_each_entry(dev, &(bus)->device_list, bus_list)
/* Iterate over all drivers of a bus
*/
#define bus_for_each_driver(bus, drv) list_for_each_entry(drv, &bus->driver_list, bus_list)
#define bus_for_each_driver(bus, drv) list_for_each_entry(drv, &(bus)->driver_list, bus_list)
extern struct bus_type platform_bus;

265
scripts/tags.sh Executable file
View File

@ -0,0 +1,265 @@
#!/bin/sh
# Generate tags or cscope files
# Usage tags.sh <mode>
#
# mode may be any of: tags, TAGS, cscope
#
# Uses the following environment variables:
# ARCH, SUBARCH, SRCARCH, srctree, src, obj
if [ "$KBUILD_VERBOSE" = "1" ]; then
set -x
fi
# This is a duplicate of RCS_FIND_IGNORE without escaped '()'
ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \
-name CVS -o -name .pc -o -name .hg -o \
-name .git ) \
-prune -o"
# Do not use full path if we do not use O=.. builds
# Use make O=. {tags|cscope}
# to force full paths for a non-O= build
if [ "${KBUILD_SRC}" = "" ]; then
tree=
else
tree=${srctree}/
fi
# Find all available archs
find_all_archs()
{
ALLSOURCE_ARCHS=""
for arch in `ls ${tree}arch`; do
ALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/}
done
}
# Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
if [ "${ALLSOURCE_ARCHS}" = "" ]; then
ALLSOURCE_ARCHS=${SRCARCH}
elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then
find_all_archs
fi
# find sources in arch/$ARCH
find_arch_sources()
{
for i in $archincludedir; do
prune="$prune -wholename $i -prune -o"
done
find ${tree}arch/$1 $ignore $prune -name "$2" -print;
}
# find sources in arch/$1/include
find_arch_include_sources()
{
include=$(find ${tree}arch/$1/ -name include -type d);
if [ -n "$include" ]; then
archincludedir="$archincludedir $include"
find $include $ignore -name "$2" -print;
fi
}
# find sources in include/
find_include_sources()
{
find ${tree}include $ignore -name config -prune -o -name "$1" -print;
}
# find sources in rest of tree
# we could benefit from a list of dirs to search in here
find_other_sources()
{
find ${tree}* $ignore \
\( -name include -o -name arch -o -name '.tmp_*' \) -prune -o \
-name "$1" -print;
}
find_sources()
{
find_arch_sources $1 "$2"
}
all_sources()
{
find_arch_include_sources ${SRCARCH} '*.[chS]'
if [ ! -z "$archinclude" ]; then
find_arch_include_sources $archinclude '*.[chS]'
fi
find_include_sources '*.[chS]'
for arch in $ALLSOURCE_ARCHS
do
find_sources $arch '*.[chS]'
done
find_other_sources '*.[chS]'
}
all_kconfigs()
{
for arch in $ALLSOURCE_ARCHS; do
find_sources $arch 'Kconfig*'
done
find_other_sources 'Kconfig*'
}
all_defconfigs()
{
find_sources $ALLSOURCE_ARCHS "defconfig"
}
docscope()
{
(echo \-k; echo \-q; all_sources) > cscope.files
cscope -b -f cscope.out
}
dogtags()
{
all_sources | gtags -i -f -
}
exuberant()
{
all_sources | xargs $1 -a \
-I __initdata,__exitdata,__acquires,__releases \
-I __read_mostly,____cacheline_aligned \
-I ____cacheline_aligned_in_smp \
-I ____cacheline_internodealigned_in_smp \
-I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
-I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
--extra=+f --c-kinds=+px \
--regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/' \
--regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
--regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/' \
--regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/' \
--regex-c++='/PAGEFLAG\(([^,)]*).*/Page\1/' \
--regex-c++='/PAGEFLAG\(([^,)]*).*/SetPage\1/' \
--regex-c++='/PAGEFLAG\(([^,)]*).*/ClearPage\1/' \
--regex-c++='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/' \
--regex-c++='/TESTPAGEFLAG\(([^,)]*).*/Page\1/' \
--regex-c++='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/' \
--regex-c++='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/' \
--regex-c++='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/' \
--regex-c++='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/' \
--regex-c++='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/' \
--regex-c++='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/' \
--regex-c++='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/' \
--regex-c++='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/' \
--regex-c++='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/' \
--regex-c++='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/' \
--regex-c++='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/' \
--regex-c++='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/' \
--regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/' \
--regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
--regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
--regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
--regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/' \
--regex-c='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
--regex-c='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
all_kconfigs | xargs $1 -a \
--langdef=kconfig --language-force=kconfig \
--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'
all_kconfigs | xargs $1 -a \
--langdef=kconfig --language-force=kconfig \
--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/CONFIG_\2/'
all_defconfigs | xargs -r $1 -a \
--langdef=dotconfig --language-force=dotconfig \
--regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
}
emacs()
{
all_sources | xargs $1 -a \
--regex='/^(ENTRY|_GLOBAL)(\([^)]*\)).*/\2/' \
--regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/' \
--regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/' \
--regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
--regex='/PAGEFLAG\(([^,)]*).*/Page\1/' \
--regex='/PAGEFLAG\(([^,)]*).*/SetPage\1/' \
--regex='/PAGEFLAG\(([^,)]*).*/ClearPage\1/' \
--regex='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/' \
--regex='/TESTPAGEFLAG\(([^,)]*).*/Page\1/' \
--regex='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/' \
--regex='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/' \
--regex='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/' \
--regex='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/' \
--regex='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/' \
--regex='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/' \
--regex='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/' \
--regex='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/' \
--regex='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/' \
--regex='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/' \
--regex='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/' \
--regex='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/' \
--regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/' \
--regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
--regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
--regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
--regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/' \
--regex='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
--regex='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
all_kconfigs | xargs $1 -a \
--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
all_kconfigs | xargs $1 -a \
--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/CONFIG_\3/'
all_defconfigs | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'
}
xtags()
{
if $1 --version 2>&1 | grep -iq exuberant; then
exuberant $1
elif $1 --version 2>&1 | grep -iq emacs; then
emacs $1
else
all_sources | xargs $1 -a
fi
}
# Support um (which uses SUBARCH)
if [ "${ARCH}" = "um" ]; then
if [ "$SUBARCH" = "i386" ]; then
archinclude=x86
elif [ "$SUBARCH" = "x86_64" ]; then
archinclude=x86
else
archinclude=${SUBARCH}
fi
fi
remove_structs=
case "$1" in
"cscope")
docscope
;;
"gtags")
dogtags
;;
"tags")
rm -f tags
xtags ctags
remove_structs=y
;;
"TAGS")
rm -f TAGS
xtags etags
remove_structs=y
;;
esac
# Remove structure forward declarations.
if [ -n "$remove_structs" ]; then
LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' $1
fi