Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
f4278b71
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f4278b71
编写于
11月 04, 2010
作者:
A
Andreas Bießmann
提交者:
Albert ARIBAUD
5月 18, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avr32: fixup definitions to ATMEL_BASE_xxx
Signed-off-by:
N
Andreas Bießmann
<
biessmann@corscience.de
>
上级
5d73bc7a
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
85 addition
and
90 deletion
+85
-90
arch/avr32/cpu/at32ap700x/sm.h
arch/avr32/cpu/at32ap700x/sm.h
+2
-2
arch/avr32/cpu/hsdramc1.h
arch/avr32/cpu/hsdramc1.h
+2
-2
arch/avr32/cpu/hsmc3.h
arch/avr32/cpu/hsmc3.h
+2
-2
arch/avr32/cpu/interrupts.c
arch/avr32/cpu/interrupts.c
+1
-1
arch/avr32/include/asm/arch-at32ap700x/gpio.h
arch/avr32/include/asm/arch-at32ap700x/gpio.h
+5
-5
arch/avr32/include/asm/arch-at32ap700x/hardware.h
arch/avr32/include/asm/arch-at32ap700x/hardware.h
+38
-38
arch/avr32/include/asm/arch-at32ap700x/portmux.h
arch/avr32/include/asm/arch-at32ap700x/portmux.h
+5
-5
arch/avr32/include/asm/hmatrix-common.h
arch/avr32/include/asm/hmatrix-common.h
+1
-1
board/atmel/atngw100/atngw100.c
board/atmel/atngw100/atngw100.c
+2
-2
board/atmel/atstk1000/atstk1000.c
board/atmel/atstk1000/atstk1000.c
+2
-2
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
+2
-1
board/mimc/mimc200/mimc200.c
board/mimc/mimc200/mimc200.c
+2
-2
board/miromico/hammerhead/hammerhead.c
board/miromico/hammerhead/hammerhead.c
+2
-1
drivers/mmc/atmel_mci.h
drivers/mmc/atmel_mci.h
+2
-2
include/configs/atngw100.h
include/configs/atngw100.h
+2
-2
include/configs/atstk1002.h
include/configs/atstk1002.h
+2
-4
include/configs/atstk1003.h
include/configs/atstk1003.h
+2
-4
include/configs/atstk1004.h
include/configs/atstk1004.h
+2
-4
include/configs/atstk1006.h
include/configs/atstk1006.h
+2
-4
include/configs/favr-32-ezkit.h
include/configs/favr-32-ezkit.h
+2
-4
include/configs/hammerhead.h
include/configs/hammerhead.h
+2
-1
include/configs/mimc200.h
include/configs/mimc200.h
+3
-1
未找到文件。
arch/avr32/cpu/at32ap700x/sm.h
浏览文件 @
f4278b71
...
...
@@ -197,8 +197,8 @@
/* Register access macros */
#define sm_readl(reg) \
readl((void *)
SM_BASE
+ SM_##reg)
readl((void *)
ATMEL_BASE_SM
+ SM_##reg)
#define sm_writel(reg,value) \
writel((value), (void *)
SM_BASE
+ SM_##reg)
writel((value), (void *)
ATMEL_BASE_SM
+ SM_##reg)
#endif
/* __CPU_AT32AP_SM_H__ */
arch/avr32/cpu/hsdramc1.h
浏览文件 @
f4278b71
...
...
@@ -136,8 +136,8 @@
/* Register access macros */
#define hsdramc1_readl(reg) \
readl((void *)
HSDRAMC_BASE
+ HSDRAMC1_##reg)
readl((void *)
ATMEL_BASE_HSDRAMC
+ HSDRAMC1_##reg)
#define hsdramc1_writel(reg,value) \
writel((value), (void *)
HSDRAMC_BASE
+ HSDRAMC1_##reg)
writel((value), (void *)
ATMEL_BASE_HSDRAMC
+ HSDRAMC1_##reg)
#endif
/* __ASM_AVR32_HSDRAMC1_H__ */
arch/avr32/cpu/hsmc3.h
浏览文件 @
f4278b71
...
...
@@ -119,8 +119,8 @@
/* Register access macros */
#define hsmc3_readl(reg) \
readl((void *)
HSMC_BASE
+ HSMC3_##reg)
readl((void *)
ATMEL_BASE_HSMC
+ HSMC3_##reg)
#define hsmc3_writel(reg,value) \
writel((value), (void *)
HSMC_BASE
+ HSMC3_##reg)
writel((value), (void *)
ATMEL_BASE_HSMC
+ HSMC3_##reg)
#endif
/* __CPU_AT32AP_HSMC3_H__ */
arch/avr32/cpu/interrupts.c
浏览文件 @
f4278b71
...
...
@@ -125,7 +125,7 @@ static int set_interrupt_handler(unsigned int nr, void (*handler)(void),
intpr
=
(
handler_addr
&
HANDLER_MASK
);
intpr
|=
(
priority
&
INTLEV_MASK
)
<<
INTLEV_SHIFT
;
writel
(
intpr
,
(
void
*
)
INTC_BASE
+
4
*
nr
);
writel
(
intpr
,
(
void
*
)
ATMEL_BASE_INTC
+
4
*
nr
);
return
0
;
}
...
...
arch/avr32/include/asm/arch-at32ap700x/gpio.h
浏览文件 @
f4278b71
...
...
@@ -45,15 +45,15 @@ static inline void *pio_pin_to_port(unsigned int pin)
{
switch
(
pin
>>
5
)
{
case
0
:
return
(
void
*
)
PIOA_BASE
;
return
(
void
*
)
ATMEL_BASE_PIOA
;
case
1
:
return
(
void
*
)
PIOB_BASE
;
return
(
void
*
)
ATMEL_BASE_PIOB
;
case
2
:
return
(
void
*
)
PIOC_BASE
;
return
(
void
*
)
ATMEL_BASE_PIOC
;
case
3
:
return
(
void
*
)
PIOD_BASE
;
return
(
void
*
)
ATMEL_BASE_PIOD
;
case
4
:
return
(
void
*
)
PIOE_BAS
E
;
return
(
void
*
)
ATMEL_BASE_PIO
E
;
default:
return
NULL
;
}
...
...
arch/avr32/include/asm/arch-at32ap700x/hardware.h
浏览文件 @
f4278b71
...
...
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __AT32AP7000_
MEMORY_MAP
_H__
#define __AT32AP7000_
MEMORY_MAP
_H__
#ifndef __AT32AP7000_
HARDWARE
_H__
#define __AT32AP7000_
HARDWARE
_H__
/* Internal and external memories */
#define EBI_SRAM_CS0_BASE 0x00000000
...
...
@@ -43,44 +43,44 @@
#define INTERNAL_SRAM_SIZE 0x00008000
/* Devices on the High Speed Bus (HSB) */
#define LCDC_BASE 0xFF000000
#define DMAC_BASE 0xFF200000
#define USB_FIFO 0xFF300000
#define LCDC_BASE
0xFF000000
#define DMAC_BASE
0xFF200000
#define USB_FIFO
0xFF300000
/* Devices on Peripheral Bus A (PBA) */
#define
SPI0_BASE
0xFFE00000
#define
SPI1_BASE
0xFFE00400
#define
TWI_BASE
0xFFE00800
#define
USART0_BASE
0xFFE00C00
#define
USART1_BASE
0xFFE01000
#define
USART2_BASE
0xFFE01400
#define
USART3_BASE
0xFFE01800
#define
SSC0_BASE
0xFFE01C00
#define
SSC1_BASE
0xFFE02000
#define
SSC2_BASE
0xFFE02400
#define
PIOA_BASE
0xFFE02800
#define
PIOB_BASE
0xFFE02C00
#define
PIOC_BASE
0xFFE03000
#define
PIOD_BASE
0xFFE03400
#define
PIOE_BAS
E 0xFFE03800
#define
PSIF_BASE
0xFFE03C00
#define
ATMEL_BASE_SPI0
0xFFE00000
#define
ATMEL_BASE_SPI1
0xFFE00400
#define
ATMEL_BASE_TWI0
0xFFE00800
#define
ATMEL_BASE_USART0
0xFFE00C00
#define
ATMEL_BASE_USART1
0xFFE01000
#define
ATMEL_BASE_USART2
0xFFE01400
#define
ATMEL_BASE_USART3
0xFFE01800
#define
ATMEL_BASE_SSC0
0xFFE01C00
#define
ATMEL_BASE_SSC1
0xFFE02000
#define
ATMEL_BASE_SSC2
0xFFE02400
#define
ATMEL_BASE_PIOA
0xFFE02800
#define
ATMEL_BASE_PIOB
0xFFE02C00
#define
ATMEL_BASE_PIOC
0xFFE03000
#define
ATMEL_BASE_PIOD
0xFFE03400
#define
ATMEL_BASE_PIO
E 0xFFE03800
#define
ATMEL_BASE_PSIF
0xFFE03C00
/* Devices on Peripheral Bus B (PBB) */
#define
SM_BASE
0xFFF00000
#define
INTC_BASE
0xFFF00400
#define
HMATRIX_BASE
0xFFF00800
#define
TIMER0_BASE
0xFFF00C00
#define
TIMER1_BASE
0xFFF01000
#define
PWM_BASE
0xFFF01400
#define
MACB0_BASE
0xFFF01800
#define
MACB1_BASE
0xFFF01C00
#define
DAC_BASE
0xFFF02000
#define
MMCI_BASE
0xFFF02400
#define A
UDIOC_BASE
0xFFF02800
#define
HISI_BASE
0xFFF02C00
#define
USB_BASE
0xFFF03000
#define
HSMC_BASE
0xFFF03400
#define
HSDRAMC_BASE
0xFFF03800
#define
ECC_BASE
0xFFF03C00
#define
ATMEL_BASE_SM
0xFFF00000
#define
ATMEL_BASE_INTC
0xFFF00400
#define
ATMEL_BASE_HMATRIX
0xFFF00800
#define
ATMEL_BASE_TIMER0
0xFFF00C00
#define
ATMEL_BASE_TIMER1
0xFFF01000
#define
ATMEL_BASE_PWM
0xFFF01400
#define
ATMEL_BASE_MACB0
0xFFF01800
#define
ATMEL_BASE_MACB1
0xFFF01C00
#define
ATMEL_BASE_DAC
0xFFF02000
#define
ATMEL_BASE_MMCI
0xFFF02400
#define A
TMEL_BASE_AUDIOC
0xFFF02800
#define
ATMEL_BASE_HISI
0xFFF02C00
#define
ATMEL_BASE_USB
0xFFF03000
#define
ATMEL_BASE_HSMC
0xFFF03400
#define
ATMEL_BASE_HSDRAMC
0xFFF03800
#define
ATMEL_BASE_ECC
0xFFF03C00
#endif
/* __AT32AP7000_
MEMORY_MAP
_H__ */
#endif
/* __AT32AP7000_
HARDWARE
_H__ */
arch/avr32/include/asm/arch-at32ap700x/portmux.h
浏览文件 @
f4278b71
...
...
@@ -24,11 +24,11 @@
#include <asm/arch/gpio.h>
#define PORTMUX_PORT_A ((void *)
PIOA_BASE
)
#define PORTMUX_PORT_B ((void *)
PIOB_BASE
)
#define PORTMUX_PORT_C ((void *)
PIOC_BASE
)
#define PORTMUX_PORT_D ((void *)
PIOD_BASE
)
#define PORTMUX_PORT_E ((void *)
PIOE_BAS
E)
#define PORTMUX_PORT_A ((void *)
ATMEL_BASE_PIOA
)
#define PORTMUX_PORT_B ((void *)
ATMEL_BASE_PIOB
)
#define PORTMUX_PORT_C ((void *)
ATMEL_BASE_PIOC
)
#define PORTMUX_PORT_D ((void *)
ATMEL_BASE_PIOD
)
#define PORTMUX_PORT_E ((void *)
ATMEL_BASE_PIO
E)
void
portmux_enable_ebi
(
unsigned
int
bus_width
,
unsigned
int
addr_width
,
unsigned
long
flags
,
unsigned
long
drive_strength
);
...
...
arch/avr32/include/asm/hmatrix-common.h
浏览文件 @
f4278b71
...
...
@@ -117,7 +117,7 @@ struct hmatrix_regs {
/* Register access macros */
#define __hmatrix_reg(reg) \
(((volatile struct hmatrix_regs *)
HMATRIX_BASE
)->reg)
(((volatile struct hmatrix_regs *)
ATMEL_BASE_HMATRIX
)->reg)
#define hmatrix_read(reg) \
(__hmatrix_reg(reg))
#define hmatrix_write(reg, value) \
...
...
board/atmel/atngw100/atngw100.c
浏览文件 @
f4278b71
...
...
@@ -112,8 +112,8 @@ int board_early_init_r(void)
#ifdef CONFIG_CMD_NET
int
board_eth_init
(
bd_t
*
bi
)
{
macb_eth_initialize
(
0
,
(
void
*
)
MACB0_BASE
,
bi
->
bi_phy_id
[
0
]);
macb_eth_initialize
(
1
,
(
void
*
)
MACB1_BASE
,
bi
->
bi_phy_id
[
1
]);
macb_eth_initialize
(
0
,
(
void
*
)
ATMEL_BASE_MACB0
,
bi
->
bi_phy_id
[
0
]);
macb_eth_initialize
(
1
,
(
void
*
)
ATMEL_BASE_MACB1
,
bi
->
bi_phy_id
[
1
]);
return
0
;
}
#endif
...
...
board/atmel/atstk1000/atstk1000.c
浏览文件 @
f4278b71
...
...
@@ -134,8 +134,8 @@ int board_early_init_r(void)
#ifdef CONFIG_CMD_NET
int
board_eth_init
(
bd_t
*
bi
)
{
macb_eth_initialize
(
0
,
(
void
*
)
MACB0_BASE
,
bi
->
bi_phy_id
[
0
]);
macb_eth_initialize
(
1
,
(
void
*
)
MACB1_BASE
,
bi
->
bi_phy_id
[
1
]);
macb_eth_initialize
(
0
,
(
void
*
)
ATMEL_BASE_MACB0
,
bi
->
bi_phy_id
[
0
]);
macb_eth_initialize
(
1
,
(
void
*
)
ATMEL_BASE_MACB1
,
bi
->
bi_phy_id
[
1
]);
return
0
;
}
#endif
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
浏览文件 @
f4278b71
...
...
@@ -104,6 +104,7 @@ int board_early_init_r(void)
#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET)
int
board_eth_init
(
bd_t
*
bi
)
{
return
macb_eth_initialize
(
0
,
(
void
*
)
MACB0_BASE
,
bi
->
bi_phy_id
[
0
]);
return
macb_eth_initialize
(
0
,
(
void
*
)
ATMEL_BASE_MACB0
,
bi
->
bi_phy_id
[
0
]);
}
#endif
board/mimc/mimc200/mimc200.c
浏览文件 @
f4278b71
...
...
@@ -221,8 +221,8 @@ void spi_cs_deactivate(struct spi_slave *slave)
#ifdef CONFIG_CMD_NET
int
board_eth_init
(
bd_t
*
bi
)
{
macb_eth_initialize
(
0
,
(
void
*
)
MACB0_BASE
,
bi
->
bi_phy_id
[
0
]);
macb_eth_initialize
(
1
,
(
void
*
)
MACB1_BASE
,
bi
->
bi_phy_id
[
1
]);
macb_eth_initialize
(
0
,
(
void
*
)
ATMEL_BASE_MACB0
,
bi
->
bi_phy_id
[
0
]);
macb_eth_initialize
(
1
,
(
void
*
)
ATMEL_BASE_MACB1
,
bi
->
bi_phy_id
[
1
]);
return
0
;
}
...
...
board/miromico/hammerhead/hammerhead.c
浏览文件 @
f4278b71
...
...
@@ -68,7 +68,8 @@ static const struct sdram_config sdram_config = {
#ifdef CONFIG_CMD_NET
int
board_eth_init
(
bd_t
*
bis
)
{
return
macb_eth_initialize
(
0
,
(
void
*
)
MACB0_BASE
,
bis
->
bi_phy_id
[
0
]);
return
macb_eth_initialize
(
0
,
(
void
*
)
ATMEL_BASE_MACB0
,
bis
->
bi_phy_id
[
0
]);
}
#endif
...
...
drivers/mmc/atmel_mci.h
浏览文件 @
f4278b71
...
...
@@ -238,8 +238,8 @@ typedef struct atmel_mci {
* Register access macros
*/
#define mmci_readl(reg) \
readl((void *)
MMCI_BASE
+ MMCI_##reg)
readl((void *)
ATMEL_BASE_MMCI
+ MMCI_##reg)
#define mmci_writel(reg,value) \
writel((value), (void *)
MMCI_BASE
+ MMCI_##reg)
writel((value), (void *)
ATMEL_BASE_MMCI
+ MMCI_##reg)
#endif
/* __CPU_AT32AP_ATMEL_MCI_H__ */
include/configs/atngw100.h
浏览文件 @
f4278b71
...
...
@@ -61,8 +61,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#define CONFIG_USART
1
1
#define CONFIG_USART
_BASE ATMEL_BASE_USART
1
#define CONFIG_USART_ID 1
/* User serviceable stuff */
#define CONFIG_DOS_PARTITION 1
...
...
include/configs/atstk1002.h
浏览文件 @
f4278b71
...
...
@@ -85,10 +85,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#undef CONFIG_USART0
#define CONFIG_USART1 1
#undef CONFIG_USART2
#undef CONFIG_USART3
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
/* User serviceable stuff */
#define CONFIG_DOS_PARTITION 1
...
...
include/configs/atstk1003.h
浏览文件 @
f4278b71
...
...
@@ -85,10 +85,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#undef CONFIG_USART0
#define CONFIG_USART1 1
#undef CONFIG_USART2
#undef CONFIG_USART3
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
/* User serviceable stuff */
#define CONFIG_DOS_PARTITION 1
...
...
include/configs/atstk1004.h
浏览文件 @
f4278b71
...
...
@@ -85,10 +85,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#undef CONFIG_USART0
#define CONFIG_USART1 1
#undef CONFIG_USART2
#undef CONFIG_USART3
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
/* User serviceable stuff */
#define CONFIG_DOS_PARTITION 1
...
...
include/configs/atstk1006.h
浏览文件 @
f4278b71
...
...
@@ -85,10 +85,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#undef CONFIG_USART0
#define CONFIG_USART1 1
#undef CONFIG_USART2
#undef CONFIG_USART3
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
/* User serviceable stuff */
#define CONFIG_DOS_PARTITION 1
...
...
include/configs/favr-32-ezkit.h
浏览文件 @
f4278b71
...
...
@@ -82,10 +82,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#undef CONFIG_USART0
#undef CONFIG_USART1
#undef CONFIG_USART2
#define CONFIG_USART3 1
#define CONFIG_USART_BASE ATMEL_BASE_USART3
#define CONFIG_USART_ID 3
/* User serviceable stuff */
#define CONFIG_DOS_PARTITION 1
...
...
include/configs/hammerhead.h
浏览文件 @
f4278b71
...
...
@@ -59,7 +59,8 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#define CONFIG_USART1 1
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
#define CONFIG_HOSTNAME hammerhead
...
...
include/configs/mimc200.h
浏览文件 @
f4278b71
...
...
@@ -63,7 +63,9 @@
*/
#define CONFIG_SYS_PLL0_OPT 0x04
#define CONFIG_USART1 1
#define CONFIG_USART_BASE ATMEL_BASE_USART1
#define CONFIG_USART_ID 1
#define CONFIG_MIMC200_DBGLINK 1
/* User serviceable stuff */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录