提交 2d941de9 编写于 作者: W Wolfgang Denk

Prepare v2010.09-rc1

Coding style cleanup.
Signed-off-by: NWolfgang Denk <wd@denx.de>
上级 8fea51a4
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
# #
VERSION = 2010 VERSION = 2010
PATCHLEVEL = 06 PATCHLEVEL = 09
SUBLEVEL = SUBLEVEL =
EXTRAVERSION = EXTRAVERSION = -rc1
ifneq "$(SUBLEVEL)" "" ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else else
......
...@@ -229,4 +229,3 @@ void at91_mci_hw_init(void) ...@@ -229,4 +229,3 @@ void at91_mci_hw_init(void)
#endif #endif
} }
#endif #endif
...@@ -268,4 +268,3 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) ...@@ -268,4 +268,3 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
} }
return 0; return 0;
} }
...@@ -181,4 +181,3 @@ setup_auxcr: ...@@ -181,4 +181,3 @@ setup_auxcr:
orrlt r0, r0, #1 << 27 orrlt r0, r0, #1 << 27
.word 0xE1600070 @ SMC .word 0xE1600070 @ SMC
bx lr bx lr
...@@ -427,4 +427,3 @@ get_36x_core_dpll_param: ...@@ -427,4 +427,3 @@ get_36x_core_dpll_param:
get_36x_per_dpll_param: get_36x_per_dpll_param:
adr r0, per_36x_dpll_param adr r0, per_36x_dpll_param
mov pc, lr mov pc, lr
...@@ -98,4 +98,3 @@ int arch_cpu_init(void) ...@@ -98,4 +98,3 @@ int arch_cpu_init(void)
set_muxconf_regs(); set_muxconf_regs();
return 0; return 0;
} }
...@@ -45,4 +45,3 @@ lowlevel_init: ...@@ -45,4 +45,3 @@ lowlevel_init:
*/ */
bl s_init bl s_init
pop {ip, pc} pop {ip, pc}
...@@ -51,4 +51,3 @@ int print_cpuinfo(void) ...@@ -51,4 +51,3 @@ int print_cpuinfo(void)
return 0; return 0;
} }
...@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = { ...@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = {
}; };
#endif #endif
...@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = { ...@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = {
}; };
#endif #endif
...@@ -83,4 +83,3 @@ and the board definition files needs: ...@@ -83,4 +83,3 @@ and the board definition files needs:
#define CONFIG_ATMEL_MCI_PORTB 1 /* Atmel XE-EK uses port B */ #define CONFIG_ATMEL_MCI_PORTB 1 /* Atmel XE-EK uses port B */
#define CONFIG_SYS_MMC_CD_PIN AT91_PIN_PC9 #define CONFIG_SYS_MMC_CD_PIN AT91_PIN_PC9
#define CONFIG_CMD_MMC 1 #define CONFIG_CMD_MMC 1
...@@ -456,4 +456,3 @@ int i2c_get_bus_num(void) ...@@ -456,4 +456,3 @@ int i2c_get_bus_num(void)
{ {
return (int) current_bus; return (int) current_bus;
} }
...@@ -103,4 +103,3 @@ void twl4030_power_mmc_init(void) ...@@ -103,4 +103,3 @@ void twl4030_power_mmc_init(void)
TWL4030_PM_RECEIVER_VMMC1_DEV_GRP, TWL4030_PM_RECEIVER_VMMC1_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1); TWL4030_PM_RECEIVER_DEV_GRP_P1);
} }
...@@ -515,4 +515,3 @@ ...@@ -515,4 +515,3 @@
#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_BOARD_SETUP 1
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
#define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_BACKSIDE_L2_CACHE
#define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E
#define CONFIG_BTB /* toggle branch predition */ #define CONFIG_BTB /* toggle branch predition */
//#define CONFIG_DDR_ECC /*#define CONFIG_DDR_ECC*/
#ifdef CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC
#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define CONFIG_MEM_INIT_VALUE 0xdeadbeef
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册