[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
9956bdf77d
commit
f6a579da9c
|
@ -32,6 +32,14 @@ board-$(CONFIG_MACH_EUKREA_CPUIMX27) := eukrea_cpuimx27
|
||||||
cpu-$(CONFIG_ARM920T) := arm920t
|
cpu-$(CONFIG_ARM920T) := arm920t
|
||||||
cpu-$(CONFIG_ARM926EJS) := arm926ejs
|
cpu-$(CONFIG_ARM926EJS) := arm926ejs
|
||||||
|
|
||||||
|
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
|
||||||
|
|
||||||
|
ifeq ($(KBUILD_SRC),)
|
||||||
|
CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
|
||||||
|
else
|
||||||
|
CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
|
||||||
|
endif
|
||||||
|
|
||||||
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
||||||
|
|
||||||
CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
|
CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
|
||||||
|
@ -42,25 +50,6 @@ CPPFLAGS += -fdata-sections -ffunction-sections
|
||||||
LDFLAGS_uboot += -static --gc-sections
|
LDFLAGS_uboot += -static --gc-sections
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(incdir-y),)
|
|
||||||
incdir-y := $(machine-y)
|
|
||||||
endif
|
|
||||||
INCDIR := arch-$(incdir-y)
|
|
||||||
|
|
||||||
# Update machine arch and proc symlinks if something which affects
|
|
||||||
# them changed. We use .arch to indicate when they were updated
|
|
||||||
# last, otherwise make uses the target directory mtime.
|
|
||||||
|
|
||||||
include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
|
|
||||||
@echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
|
|
||||||
ifneq ($(KBUILD_SRC),)
|
|
||||||
$(Q)mkdir -p include/asm-arm
|
|
||||||
$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
|
|
||||||
else
|
|
||||||
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
|
|
||||||
endif
|
|
||||||
@touch $@
|
|
||||||
|
|
||||||
uboot.netx: uboot.bin
|
uboot.netx: uboot.bin
|
||||||
$(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx \
|
$(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx \
|
||||||
--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL) \
|
--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL) \
|
||||||
|
@ -78,7 +67,6 @@ all: $(KBUILD_IMAGE)
|
||||||
archprepare: maketools
|
archprepare: maketools
|
||||||
|
|
||||||
PHONY += maketools
|
PHONY += maketools
|
||||||
maketools: include/asm-arm/.arch
|
|
||||||
|
|
||||||
# Add architecture specific flags
|
# Add architecture specific flags
|
||||||
ifeq ($(CONFIG_ARMCORTEXA8),y)
|
ifeq ($(CONFIG_ARMCORTEXA8),y)
|
||||||
|
@ -104,4 +92,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/u-boot.lds
|
||||||
lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds
|
lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/u-boot.lds
|
||||||
|
|
||||||
CLEAN_FILES += arch/arm/lib/u-boot.lds
|
CLEAN_FILES += arch/arm/lib/u-boot.lds
|
||||||
MRPROPER_FILES += include/asm-arm/arch
|
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
#define _ARCH_ARM_GPIO_H
|
#define _ARCH_ARM_GPIO_H
|
||||||
|
|
||||||
/* not all ARM platforms necessarily support this API ... */
|
/* not all ARM platforms necessarily support this API ... */
|
||||||
#include <asm/arch/gpio.h>
|
#include <mach/gpio.h>
|
||||||
|
|
||||||
#endif /* _ARCH_ARM_GPIO_H */
|
#endif /* _ARCH_ARM_GPIO_H */
|
||||||
|
|
|
@ -13,6 +13,6 @@
|
||||||
#ifndef __ASM_HARDWARE_H
|
#ifndef __ASM_HARDWARE_H
|
||||||
#define __ASM_HARDWARE_H
|
#define __ASM_HARDWARE_H
|
||||||
|
|
||||||
#include <asm/arch/hardware.h>
|
#include <mach/hardware.h>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/armlinux.h>
|
#include <asm/armlinux.h>
|
||||||
#include <asm/hardware.h>
|
#include <asm/hardware.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <mach/at91_pmc.h>
|
||||||
#include <asm/arch/at91sam9260_matrix.h>
|
#include <mach/at91sam9260_matrix.h>
|
||||||
#include <asm/arch/gpio.h>
|
#include <mach/gpio.h>
|
||||||
#include <asm/arch/io.h>
|
#include <mach/io.h>
|
||||||
|
|
||||||
static struct memory_platform_data sram_pdata = {
|
static struct memory_platform_data sram_pdata = {
|
||||||
.name = "sram0",
|
.name = "sram0",
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/armlinux.h>
|
#include <asm/armlinux.h>
|
||||||
#include <asm/hardware.h>
|
#include <asm/hardware.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <mach/at91_pmc.h>
|
||||||
#include <asm/arch/at91sam9263_matrix.h>
|
#include <mach/at91sam9263_matrix.h>
|
||||||
#include <asm/arch/board.h>
|
#include <mach/board.h>
|
||||||
#include <asm/arch/gpio.h>
|
#include <mach/gpio.h>
|
||||||
#include <asm/arch/io.h>
|
#include <mach/io.h>
|
||||||
|
|
||||||
static struct memory_platform_data ram_pdata = {
|
static struct memory_platform_data ram_pdata = {
|
||||||
.name = "ram0",
|
.name = "ram0",
|
||||||
|
|
|
@ -33,10 +33,10 @@
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <asm/hardware.h>
|
#include <asm/hardware.h>
|
||||||
#include <asm/arch/at91_pit.h>
|
#include <mach/at91_pit.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <mach/at91_pmc.h>
|
||||||
#include <asm/arch/at91_rstc.h>
|
#include <mach/at91_rstc.h>
|
||||||
#include <asm/arch/io.h>
|
#include <mach/io.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
uint64_t at91sam9_clocksource_read(void)
|
uint64_t at91sam9_clocksource_read(void)
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/gpio.h>
|
#include <mach/gpio.h>
|
||||||
#include <gpio.h>
|
#include <gpio.h>
|
||||||
|
|
||||||
static int gpio_banks;
|
static int gpio_banks;
|
||||||
|
|
|
@ -12,17 +12,17 @@
|
||||||
#define __ASM_ARCH_AT91SAM9_MATRIX_H
|
#define __ASM_ARCH_AT91SAM9_MATRIX_H
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
|
#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
|
||||||
#include <asm/arch/at91sam9260_matrix.h>
|
#include <mach/at91sam9260_matrix.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9261)
|
#elif defined(CONFIG_ARCH_AT91SAM9261)
|
||||||
#include <asm/arch/at91sam9261_matrix.h>
|
#include <mach/at91sam9261_matrix.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9263)
|
#elif defined(CONFIG_ARCH_AT91SAM9263)
|
||||||
#include <asm/arch/at91sam9263_matrix.h>
|
#include <mach/at91sam9263_matrix.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9RL)
|
#elif defined(CONFIG_ARCH_AT91SAM9RL)
|
||||||
#include <asm/arch/at91sam9rl_matrix.h>
|
#include <mach/at91sam9rl_matrix.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91CAP9)
|
#elif defined(CONFIG_ARCH_AT91CAP9)
|
||||||
#include <asm/arch/at91cap9_matrix.h>
|
#include <mach/at91cap9_matrix.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
|
#elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
|
||||||
#include <asm/arch/at91sam9g45_matrix.h>
|
#include <mach/at91sam9g45_matrix.h>
|
||||||
#else
|
#else
|
||||||
#error "Unsupported AT91SAM9/CAP9 processor"
|
#error "Unsupported AT91SAM9/CAP9 processor"
|
||||||
#endif
|
#endif
|
|
@ -24,7 +24,7 @@
|
||||||
#ifndef __ASM_ARM_ARCH_CLK_H__
|
#ifndef __ASM_ARM_ARCH_CLK_H__
|
||||||
#define __ASM_ARM_ARCH_CLK_H__
|
#define __ASM_ARM_ARCH_CLK_H__
|
||||||
|
|
||||||
#include <asm/arch/hardware.h>
|
#include <mach/hardware.h>
|
||||||
|
|
||||||
static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
|
static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
|
||||||
{
|
{
|
|
@ -15,8 +15,8 @@
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm-generic/errno.h>
|
#include <asm-generic/errno.h>
|
||||||
#include <asm/arch/at91_pio.h>
|
#include <mach/at91_pio.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <mach/hardware.h>
|
||||||
|
|
||||||
#define PIN_BASE 32
|
#define PIN_BASE 32
|
||||||
|
|
|
@ -15,21 +15,21 @@
|
||||||
#define __ASM_ARCH_HARDWARE_H
|
#define __ASM_ARCH_HARDWARE_H
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_AT91RM9200)
|
#if defined(CONFIG_ARCH_AT91RM9200)
|
||||||
#include <asm/arch/at91rm9200.h>
|
#include <mach/at91rm9200.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
|
#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
|
||||||
#include <asm/arch/at91sam9260.h>
|
#include <mach/at91sam9260.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10)
|
#elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10)
|
||||||
#include <asm/arch/at91sam9261.h>
|
#include <mach/at91sam9261.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9263)
|
#elif defined(CONFIG_ARCH_AT91SAM9263)
|
||||||
#include <asm/arch/at91sam9263.h>
|
#include <mach/at91sam9263.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9RL)
|
#elif defined(CONFIG_ARCH_AT91SAM9RL)
|
||||||
#include <asm/arch/at91sam9rl.h>
|
#include <mach/at91sam9rl.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
|
#elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
|
||||||
#include <asm/arch/at91sam9g45.h>
|
#include <mach/at91sam9g45.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91CAP9)
|
#elif defined(CONFIG_ARCH_AT91CAP9)
|
||||||
#include <asm/arch/at91cap9.h>
|
#include <mach/at91cap9.h>
|
||||||
#elif defined(CONFIG_ARCH_AT91X40)
|
#elif defined(CONFIG_ARCH_AT91X40)
|
||||||
#include <asm/arch/at91x40.h>
|
#include <mach/at91x40.h>
|
||||||
#else
|
#else
|
||||||
#error "Unsupported AT91 processor"
|
#error "Unsupported AT91 processor"
|
||||||
#endif
|
#endif
|
|
@ -28,14 +28,14 @@
|
||||||
|
|
||||||
#include <linux/autoconf.h>
|
#include <linux/autoconf.h>
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <asm/arch/at91_pmc.h>
|
#include <mach/at91_pmc.h>
|
||||||
#include <asm/arch/at91_pio.h>
|
#include <mach/at91_pio.h>
|
||||||
#include <asm/arch/at91_rstc.h>
|
#include <mach/at91_rstc.h>
|
||||||
#include <asm/arch/at91_wdt.h>
|
#include <mach/at91_wdt.h>
|
||||||
#include <asm/arch/at91sam9_matrix.h>
|
#include <mach/at91sam9_matrix.h>
|
||||||
#include <asm/arch/at91sam9_sdramc.h>
|
#include <mach/at91sam9_sdramc.h>
|
||||||
#include <asm/arch/at91sam9_smc.h>
|
#include <mach/at91sam9_smc.h>
|
||||||
|
|
||||||
_TEXT_BASE:
|
_TEXT_BASE:
|
||||||
.word TEXT_BASE
|
.word TEXT_BASE
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <asm/arch/io.h>
|
#include <mach/io.h>
|
||||||
|
|
||||||
#include <asm/arch/at91sam9_smc.h>
|
#include <mach/at91sam9_smc.h>
|
||||||
#include <asm/arch/sam9_smc.h>
|
#include <mach/sam9_smc.h>
|
||||||
|
|
||||||
void sam9_smc_configure(int cs, struct sam9_smc_config* config)
|
void sam9_smc_configure(int cs, struct sam9_smc_config* config)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
|
|
||||||
static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,8 +33,8 @@
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <notifier.h>
|
#include <notifier.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
|
|
||||||
#define GPT(x) __REG(IMX_TIM1_BASE + (x))
|
#define GPT(x) __REG(IMX_TIM1_BASE + (x))
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
|
|
||||||
void imx_gpio_mode(int gpio_mode)
|
void imx_gpio_mode(int gpio_mode)
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
|
|
||||||
int imx_silicon_revision(void)
|
int imx_silicon_revision(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
|
|
||||||
int imx_silicon_revision(void)
|
int imx_silicon_revision(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,17 +40,17 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_IMX1
|
#ifdef CONFIG_ARCH_IMX1
|
||||||
# include <asm/arch/imx1-regs.h>
|
# include <mach/imx1-regs.h>
|
||||||
#elif defined CONFIG_ARCH_IMX21
|
#elif defined CONFIG_ARCH_IMX21
|
||||||
# include <asm/arch/imx21-regs.h>
|
# include <mach/imx21-regs.h>
|
||||||
#elif defined CONFIG_ARCH_IMX27
|
#elif defined CONFIG_ARCH_IMX27
|
||||||
# include <asm/arch/imx27-regs.h>
|
# include <mach/imx27-regs.h>
|
||||||
#elif defined CONFIG_ARCH_IMX31
|
#elif defined CONFIG_ARCH_IMX31
|
||||||
# include <asm/arch/imx31-regs.h>
|
# include <mach/imx31-regs.h>
|
||||||
#elif defined CONFIG_ARCH_IMX35
|
#elif defined CONFIG_ARCH_IMX35
|
||||||
# include <asm/arch/imx35-regs.h>
|
# include <mach/imx35-regs.h>
|
||||||
#elif defined CONFIG_ARCH_IMX25
|
#elif defined CONFIG_ARCH_IMX25
|
||||||
# include <asm/arch/imx25-regs.h>
|
# include <mach/imx25-regs.h>
|
||||||
#else
|
#else
|
||||||
# error "unknown i.MX soc type"
|
# error "unknown i.MX soc type"
|
||||||
#endif
|
#endif
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __MACH_IOMUX_MX25_H__
|
#ifndef __MACH_IOMUX_MX25_H__
|
||||||
#define __MACH_IOMUX_MX25_H__
|
#define __MACH_IOMUX_MX25_H__
|
||||||
|
|
||||||
#include <asm/arch/iomux-v3.h>
|
#include <mach/iomux-v3.h>
|
||||||
|
|
||||||
#define SRE (1 << 0)
|
#define SRE (1 << 0)
|
||||||
#define DSE_STD (0 << 1)
|
#define DSE_STD (0 << 1)
|
|
@ -19,7 +19,7 @@
|
||||||
#ifndef __MACH_IOMUX_MX35_H__
|
#ifndef __MACH_IOMUX_MX35_H__
|
||||||
#define __MACH_IOMUX_MX35_H__
|
#define __MACH_IOMUX_MX35_H__
|
||||||
|
|
||||||
#include <asm/arch/iomux-v3.h>
|
#include <mach/iomux-v3.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>
|
* The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>
|
|
@ -19,8 +19,8 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/iomux-mx31.h>
|
#include <mach/iomux-mx31.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IOMUX register (base) addresses
|
* IOMUX register (base) addresses
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
*/
|
*/
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/iomux-v3.h>
|
#include <mach/iomux-v3.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* setups a single pin:
|
* setups a single pin:
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
|
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <driver.h>
|
#include <driver.h>
|
||||||
|
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/generic.h>
|
#include <mach/generic.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
|
||||||
#ifndef CLK32
|
#ifndef CLK32
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
|
||||||
unsigned long imx_get_mpllclk(void)
|
unsigned long imx_get_mpllclk(void)
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/generic.h>
|
#include <mach/generic.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
|
||||||
#ifndef CLK32
|
#ifndef CLK32
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
|
||||||
ulong imx_get_mpl_dpdgck_clk(void)
|
ulong imx_get_mpl_dpdgck_clk(void)
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <mach/imx-regs.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <mach/clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
|
||||||
unsigned long imx_get_mpllclk(void)
|
unsigned long imx_get_mpllclk(void)
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <asm/arch/netx-regs.h>
|
#include <mach/netx-regs.h>
|
||||||
|
|
||||||
uint64_t netx_clocksource_read(void)
|
uint64_t netx_clocksource_read(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <asm/arch/netx-regs.h>
|
#include <mach/netx-regs.h>
|
||||||
#include "eth_firmware.h"
|
#include "eth_firmware.h"
|
||||||
|
|
||||||
struct fw_header {
|
struct fw_header {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
|
||||||
#include <asm/arch/netx-regs.h>
|
#include <mach/netx-regs.h>
|
||||||
|
|
||||||
int timer_init (void)
|
int timer_init (void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/arch/netx-regs.h>
|
#include <mach/netx-regs.h>
|
||||||
#include <asm/arch/netx-cm.h>
|
#include <mach/netx-cm.h>
|
||||||
|
|
||||||
#define I2C_CTRL_ENABLE (1<<0)
|
#define I2C_CTRL_ENABLE (1<<0)
|
||||||
#define I2C_CTRL_SPEED_25 (0<<1)
|
#define I2C_CTRL_SPEED_25 (0<<1)
|
||||||
|
|
|
@ -30,10 +30,10 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/silicon.h>
|
#include <mach/silicon.h>
|
||||||
#include <asm/arch/gpmc.h>
|
#include <mach/gpmc.h>
|
||||||
#include <asm/arch/sys_info.h>
|
#include <mach/sys_info.h>
|
||||||
#include <asm/arch/syslib.h>
|
#include <mach/syslib.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Do a Generic initialization of GPMC. if you choose otherwise,
|
* @brief Do a Generic initialization of GPMC. if you choose otherwise,
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#define S38_4M 38400000
|
#define S38_4M 38400000
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_OMAP3
|
#ifdef CONFIG_ARCH_OMAP3
|
||||||
#include <asm/arch/omap3-clock.h>
|
#include <mach/omap3-clock.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __OMAP_CLOCKS_H_ */
|
#endif /* __OMAP_CLOCKS_H_ */
|
|
@ -91,7 +91,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* macro for Padconfig Registers @see
|
* macro for Padconfig Registers @see
|
||||||
* include/asm/arch-arm/arch-omap/omap3-mux.h
|
* include/mach-arm/arch-omap/omap3-mux.h
|
||||||
*/
|
*/
|
||||||
#define CP(X) (CONTROL_PADCONF_##X)
|
#define CP(X) (CONTROL_PADCONF_##X)
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
/* Each platform silicon header comes here */
|
/* Each platform silicon header comes here */
|
||||||
#ifdef CONFIG_ARCH_OMAP3
|
#ifdef CONFIG_ARCH_OMAP3
|
||||||
#include <asm/arch/omap3-silicon.h>
|
#include <mach/omap3-silicon.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If Architecture specific init functions are present */
|
/* If Architecture specific init functions are present */
|
|
@ -40,11 +40,11 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/silicon.h>
|
#include <mach/silicon.h>
|
||||||
#include <asm/arch/clocks.h>
|
#include <mach/clocks.h>
|
||||||
#include <asm/arch/timers.h>
|
#include <mach/timers.h>
|
||||||
#include <asm/arch/sys_info.h>
|
#include <mach/sys_info.h>
|
||||||
#include <asm/arch/syslib.h>
|
#include <mach/syslib.h>
|
||||||
|
|
||||||
/* Following functions are exported from omap3_clock_core.S */
|
/* Following functions are exported from omap3_clock_core.S */
|
||||||
#ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
|
#ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
|
||||||
|
|
|
@ -37,9 +37,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <asm/arch/silicon.h>
|
#include <mach/silicon.h>
|
||||||
#include <asm/arch/clocks.h>
|
#include <mach/clocks.h>
|
||||||
#include <asm/arch/gpmc.h>
|
#include <mach/gpmc.h>
|
||||||
|
|
||||||
#ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
|
#ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -37,9 +37,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <asm/arch/silicon.h>
|
#include <mach/silicon.h>
|
||||||
#include <asm/arch/wdt.h>
|
#include <mach/wdt.h>
|
||||||
#include <asm/arch/clocks.h>
|
#include <mach/clocks.h>
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT
|
#ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT
|
||||||
.globl arch_init_lowlevel
|
.globl arch_init_lowlevel
|
||||||
|
|
|
@ -37,15 +37,15 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/silicon.h>
|
#include <mach/silicon.h>
|
||||||
#include <asm/arch/gpmc.h>
|
#include <mach/gpmc.h>
|
||||||
#include <asm/arch/sdrc.h>
|
#include <mach/sdrc.h>
|
||||||
#include <asm/arch/control.h>
|
#include <mach/control.h>
|
||||||
#include <asm/arch/omap3-smx.h>
|
#include <mach/omap3-smx.h>
|
||||||
#include <asm/arch/clocks.h>
|
#include <mach/clocks.h>
|
||||||
#include <asm/arch/wdt.h>
|
#include <mach/wdt.h>
|
||||||
#include <asm/arch/sys_info.h>
|
#include <mach/sys_info.h>
|
||||||
#include <asm/arch/syslib.h>
|
#include <mach/syslib.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Reset the CPU
|
* @brief Reset the CPU
|
||||||
|
|
|
@ -34,11 +34,11 @@
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/silicon.h>
|
#include <mach/silicon.h>
|
||||||
#include <asm/arch/clocks.h>
|
#include <mach/clocks.h>
|
||||||
#include <asm/arch/timers.h>
|
#include <mach/timers.h>
|
||||||
#include <asm/arch/sys_info.h>
|
#include <mach/sys_info.h>
|
||||||
#include <asm/arch/syslib.h>
|
#include <mach/syslib.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Provide a simple clock read
|
* @brief Provide a simple clock read
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/syslib.h>
|
#include <mach/syslib.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief simple spin loop
|
* @brief simple spin loop
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/s3c24x0-iomap.h>
|
#include <mach/s3c24x0-iomap.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculate the current M-PLL clock.
|
* Calculate the current M-PLL clock.
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include <asm/arch/s3c24x0-iomap.h>
|
#include <mach/s3c24x0-iomap.h>
|
||||||
|
|
||||||
.section ".text_bare_init.s3c24x0_disable_wd","ax"
|
.section ".text_bare_init.s3c24x0_disable_wd","ax"
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue