Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
This commit is contained in:
Russell King
Russell King
Коммит
a1b81a84ff
|
|
@ -23,9 +23,14 @@ KBUILD_AFLAGS += $(cpuflags-y)
|
||||||
|
|
||||||
CHECKFLAGS += -D__avr32__ -D__BIG_ENDIAN
|
CHECKFLAGS += -D__avr32__ -D__BIG_ENDIAN
|
||||||
|
|
||||||
|
machine-$(CONFIG_PLATFORM_AT32AP) := at32ap
|
||||||
|
machdirs := $(patsubst %,arch/avr32/mach-%/, $(machine-y))
|
||||||
|
|
||||||
|
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
|
||||||
|
|
||||||
head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o
|
head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o
|
||||||
head-y += arch/avr32/kernel/head.o
|
head-y += arch/avr32/kernel/head.o
|
||||||
core-$(CONFIG_PLATFORM_AT32AP) += arch/avr32/mach-at32ap/
|
core-y += $(machdirs)
|
||||||
core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/
|
core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/
|
||||||
core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/
|
core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/
|
||||||
core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/
|
core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
#include <linux/mtd/partitions.h>
|
#include <linux/mtd/partitions.h>
|
||||||
#include <linux/mtd/physmap.h>
|
#include <linux/mtd/physmap.h>
|
||||||
|
|
||||||
#include <asm/arch/smc.h>
|
#include <mach/smc.h>
|
||||||
|
|
||||||
static struct smc_timing flash_timing __initdata = {
|
static struct smc_timing flash_timing __initdata = {
|
||||||
.ncs_read_setup = 0,
|
.ncs_read_setup = 0,
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,10 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
#include <asm/arch/at32ap700x.h>
|
#include <mach/at32ap700x.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/init.h>
|
#include <mach/init.h>
|
||||||
#include <asm/arch/portmux.h>
|
#include <mach/portmux.h>
|
||||||
|
|
||||||
/* Oscillator frequencies. These are board-specific */
|
/* Oscillator frequencies. These are board-specific */
|
||||||
unsigned long at32_board_osc_rates[3] = {
|
unsigned long at32_board_osc_rates[3] = {
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,10 @@
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
#include <asm/atmel-mci.h>
|
#include <asm/atmel-mci.h>
|
||||||
|
|
||||||
#include <asm/arch/at32ap700x.h>
|
#include <mach/at32ap700x.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/init.h>
|
#include <mach/init.h>
|
||||||
#include <asm/arch/portmux.h>
|
#include <mach/portmux.h>
|
||||||
|
|
||||||
#include "atstk1000.h"
|
#include "atstk1000.h"
|
||||||
|
|
||||||
|
|
@ -49,7 +49,7 @@ unsigned long at32_board_osc_rates[3] = {
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_BOARD_ATSTK1006
|
#ifdef CONFIG_BOARD_ATSTK1006
|
||||||
#include <linux/mtd/partitions.h>
|
#include <linux/mtd/partitions.h>
|
||||||
#include <asm/arch/smc.h>
|
#include <mach/smc.h>
|
||||||
|
|
||||||
static struct smc_timing nand_timing __initdata = {
|
static struct smc_timing nand_timing __initdata = {
|
||||||
.ncs_read_setup = 0,
|
.ncs_read_setup = 0,
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,10 @@
|
||||||
|
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
#include <asm/arch/at32ap700x.h>
|
#include <mach/at32ap700x.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/init.h>
|
#include <mach/init.h>
|
||||||
#include <asm/arch/portmux.h>
|
#include <mach/portmux.h>
|
||||||
|
|
||||||
#include "atstk1000.h"
|
#include "atstk1000.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,10 @@
|
||||||
|
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
#include <asm/arch/at32ap700x.h>
|
#include <mach/at32ap700x.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/init.h>
|
#include <mach/init.h>
|
||||||
#include <asm/arch/portmux.h>
|
#include <mach/portmux.h>
|
||||||
|
|
||||||
#include "atstk1000.h"
|
#include "atstk1000.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
#include <linux/mtd/partitions.h>
|
#include <linux/mtd/partitions.h>
|
||||||
#include <linux/mtd/physmap.h>
|
#include <linux/mtd/physmap.h>
|
||||||
|
|
||||||
#include <asm/arch/smc.h>
|
#include <mach/smc.h>
|
||||||
|
|
||||||
static struct smc_timing flash_timing __initdata = {
|
static struct smc_timing flash_timing __initdata = {
|
||||||
.ncs_read_setup = 0,
|
.ncs_read_setup = 0,
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
|
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
#include <asm/arch/at32ap700x.h>
|
#include <mach/at32ap700x.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/portmux.h>
|
#include <mach/portmux.h>
|
||||||
|
|
||||||
#include "atstk1000.h"
|
#include "atstk1000.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#ifndef __ASM_AVR32_GPIO_H
|
#ifndef __ASM_AVR32_GPIO_H
|
||||||
#define __ASM_AVR32_GPIO_H
|
#define __ASM_AVR32_GPIO_H
|
||||||
|
|
||||||
#include <asm/arch/gpio.h>
|
#include <mach/gpio.h>
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_GPIO_H */
|
#endif /* __ASM_AVR32_GPIO_H */
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
#include <asm/addrspace.h>
|
#include <asm/addrspace.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
|
||||||
#include <asm/arch/io.h>
|
#include <mach/io.h>
|
||||||
|
|
||||||
/* virt_to_phys will only work when address is in P1 or P2 */
|
/* virt_to_phys will only work when address is in P1 or P2 */
|
||||||
static __inline__ unsigned long virt_to_phys(volatile void *address)
|
static __inline__ unsigned long virt_to_phys(volatile void *address)
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#define NR_INTERNAL_IRQS 64
|
#define NR_INTERNAL_IRQS 64
|
||||||
|
|
||||||
#include <asm/arch/irq.h>
|
#include <mach/irq.h>
|
||||||
|
|
||||||
#ifndef NR_IRQS
|
#ifndef NR_IRQS
|
||||||
#define NR_IRQS (NR_INTERNAL_IRQS)
|
#define NR_IRQS (NR_INTERNAL_IRQS)
|
||||||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче