V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Coding Style cleanup, update CHANGELOG 

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2008-01-09 11:36:21 +01:00
parent 2eb6e01049
commit 435dc8fcdb
4 changed files with 2678 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2549
CHANGELOG
View File

File diff suppressed because it is too large Load Diff

240
board/apollon/lowlevel_init.S
View File

@ -31,16 +31,16 @@
#include <asm/arch/clocks.h> #include <asm/arch/clocks.h>
#include "mem.h" #include "mem.h"
#define APOLLON_CS0_BASE 0x00000000 #define APOLLON_CS0_BASE 0x00000000
#ifdef PRCM_CONFIG_I #ifdef PRCM_CONFIG_I
#define SDRC_ACTIM_CTRLA_0_VAL 0x7BA35907 #define SDRC_ACTIM_CTRLA_0_VAL 0x7BA35907
#define SDRC_ACTIM_CTRLB_0_VAL 0x00000013 #define SDRC_ACTIM_CTRLB_0_VAL 0x00000013
#define SDRC_RFR_CTRL_0_VAL 0x00044C01 #define SDRC_RFR_CTRL_0_VAL 0x00044C01
#elif defined(PRCM_CONFIG_II) #elif defined(PRCM_CONFIG_II)
#define SDRC_ACTIM_CTRLA_0_VAL 0x4A59B485 #define SDRC_ACTIM_CTRLA_0_VAL 0x4A59B485
#define SDRC_ACTIM_CTRLB_0_VAL 0x0000000C #define SDRC_ACTIM_CTRLB_0_VAL 0x0000000C
#define SDRC_RFR_CTRL_0_VAL 0x00030001 #define SDRC_RFR_CTRL_0_VAL 0x00030001
#endif #endif
#define SDRAM_BASE_ADDRESS 0x80008000 #define SDRAM_BASE_ADDRESS 0x80008000
@ -66,100 +66,100 @@ flash_setup:
ldr r1, =WD_UNLOCK2 ldr r1, =WD_UNLOCK2
str r1, [r0, #WSPR] str r1, [r0, #WSPR]
/* Pin muxing for SDRC */ /* Pin muxing for SDRC */
mov r1, #0x00 mov r1, #0x00
ldr r0, =0x480000A1 /* ball C12, mode 0 */ ldr r0, =0x480000A1 /* ball C12, mode 0 */
strb r1, [r0] strb r1, [r0]
ldr r0, =0x48000032 /* ball D11, mode 0 */ ldr r0, =0x48000032 /* ball D11, mode 0 */
strb r1, [r0] strb r1, [r0]
ldr r0, =0x480000A3 /* ball B13, mode 0 */ ldr r0, =0x480000A3 /* ball B13, mode 0 */
strb r1, [r0] strb r1, [r0]
/* SDRC setting */ /* SDRC setting */
ldr r0, =OMAP2420_SDRC_BASE ldr r0, =OMAP2420_SDRC_BASE
ldr r1, =0x00000010 ldr r1, =0x00000010
str r1, [r0, #0x10] str r1, [r0, #0x10]
ldr r1, =0x00000100 ldr r1, =0x00000100
str r1, [r0, #0x44] str r1, [r0, #0x44]
/* SDRC CS0 configuration */ /* SDRC CS0 configuration */
ldr r1, =0x00d04011 ldr r1, =0x00d04011
str r1, [r0, #0x80] str r1, [r0, #0x80]
ldr r1, =SDRC_ACTIM_CTRLA_0_VAL ldr r1, =SDRC_ACTIM_CTRLA_0_VAL
str r1, [r0, #0x9C] str r1, [r0, #0x9C]
ldr r1, =SDRC_ACTIM_CTRLB_0_VAL ldr r1, =SDRC_ACTIM_CTRLB_0_VAL
str r1, [r0, #0xA0] str r1, [r0, #0xA0]
ldr r1, =SDRC_RFR_CTRL_0_VAL ldr r1, =SDRC_RFR_CTRL_0_VAL
str r1, [r0, #0xA4] str r1, [r0, #0xA4]
ldr r1, =0x00000041 ldr r1, =0x00000041
str r1, [r0, #0x70] str r1, [r0, #0x70]
/* Manual command sequence */ /* Manual command sequence */
ldr r1, =0x00000007 ldr r1, =0x00000007
str r1, [r0, #0xA8] str r1, [r0, #0xA8]
ldr r1, =0x00000000 ldr r1, =0x00000000
str r1, [r0, #0xA8] str r1, [r0, #0xA8]
ldr r1, =0x00000001 ldr r1, =0x00000001
str r1, [r0, #0xA8] str r1, [r0, #0xA8]
ldr r1, =0x00000002 ldr r1, =0x00000002
str r1, [r0, #0xA8] str r1, [r0, #0xA8]
str r1, [r0, #0xA8] str r1, [r0, #0xA8]
/* /*
* CS0 SDRC Mode register * CS0 SDRC Mode register
* Burst length = 4 - DDR memory * Burst length = 4 - DDR memory
* Serial mode * Serial mode
* CAS latency = 3 * CAS latency = 3
*/ */
ldr r1, =0x00000032 ldr r1, =0x00000032
str r1, [r0, #0x84] str r1, [r0, #0x84]
/* Note: You MUST set EMR values */ /* Note: You MUST set EMR values */
/* EMR1 & EMR2 */ /* EMR1 & EMR2 */
ldr r1, =0x00000000 ldr r1, =0x00000000
str r1, [r0, #0x88] str r1, [r0, #0x88]
str r1, [r0, #0x8C] str r1, [r0, #0x8C]
#ifdef OLD_SDRC_DLLA_CTRL #ifdef OLD_SDRC_DLLA_CTRL
/* SDRC_DLLA_CTRL */ /* SDRC_DLLA_CTRL */
ldr r1, =0x00007306 ldr r1, =0x00007306
str r1, [r0, #0x60] str r1, [r0, #0x60]
ldr r1, =0x00007303 ldr r1, =0x00007303
str r1, [r0, #0x60] str r1, [r0, #0x60]
#else #else
/* SDRC_DLLA_CTRL */ /* SDRC_DLLA_CTRL */
ldr r1, =0x00000506 ldr r1, =0x00000506
str r1, [r0, #0x60] str r1, [r0, #0x60]
ldr r1, =0x00000503 ldr r1, =0x00000503
str r1, [r0, #0x60] str r1, [r0, #0x60]
#endif #endif
#ifdef __BROKEN_FEATURE__ #ifdef __BROKEN_FEATURE__
/* SDRC_DLLB_CTRL */ /* SDRC_DLLB_CTRL */
ldr r1, =0x00000506 ldr r1, =0x00000506
str r1, [r0, #0x68] str r1, [r0, #0x68]
ldr r1, =0x00000503 ldr r1, =0x00000503
str r1, [r0, #0x68] str r1, [r0, #0x68]
#endif #endif
/* little delay after init */ /* little delay after init */
mov r2, #0x1800 mov r2, #0x1800
1: 1:
subs r2, r2, #0x1 subs r2, r2, #0x1
bne 1b bne 1b
/* Setup base address */ /* Setup base address */
ldr r0, =0x00000000 /* NOR address */ ldr r0, =0x00000000 /* NOR address */
@ -178,21 +178,21 @@ copy_loop:
#endif #endif
prcm_setup: prcm_setup:
ldr r0, =OMAP2420_CM_BASE ldr r0, =OMAP2420_CM_BASE
ldr r1, [r0, #0x544] /* CLKSEL2_PLL */ ldr r1, [r0, #0x544] /* CLKSEL2_PLL */
bic r1, r1, #0x03 bic r1, r1, #0x03
orr r1, r1, #0x02 orr r1, r1, #0x02
str r1, [r0, #0x544] str r1, [r0, #0x544]
ldr r1, [r0, #0x500] ldr r1, [r0, #0x500]
bic r1, r1, #0x03 bic r1, r1, #0x03
orr r1, r1, #0x01 orr r1, r1, #0x01
str r1, [r0, #0x500] str r1, [r0, #0x500]
ldr r1, [r0, #0x140] ldr r1, [r0, #0x140]
bic r1, r1, #0x1f bic r1, r1, #0x1f
orr r1, r1, #0x02 orr r1, r1, #0x02
str r1, [r0, #0x140] str r1, [r0, #0x140]
#ifdef PRCM_CONFIG_I #ifdef PRCM_CONFIG_I
ldr r1, =0x000003C3 ldr r1, =0x000003C3
@ -204,58 +204,58 @@ prcm_setup:
ldr r1, =0x00000002 ldr r1, =0x00000002
str r1, [r0, #0x340] str r1, [r0, #0x340]
ldr r1, =CM_CLKSEL1_CORE ldr r1, =CM_CLKSEL1_CORE
#ifdef PRCM_CONFIG_I #ifdef PRCM_CONFIG_I
ldr r2, =0x08300C44 ldr r2, =0x08300C44
#else #else
ldr r2, =0x04600C26 ldr r2, =0x04600C26
#endif #endif
str r2, [r1] str r2, [r1]
ldr r0, =OMAP2420_CM_BASE ldr r0, =OMAP2420_CM_BASE
ldr r1, [r0, #0x084] ldr r1, [r0, #0x084]
and r1, r1, #0x01 and r1, r1, #0x01
cmp r1, #0x01 cmp r1, #0x01
bne clkvalid bne clkvalid
b . b .
clkvalid: clkvalid:
mov r1, #0x01 mov r1, #0x01
str r1, [r0, #0x080] str r1, [r0, #0x080]
waitvalid: waitvalid:
ldr r1, [r0, #0x084] ldr r1, [r0, #0x084]
and r1, r1, #0x01 and r1, r1, #0x01
cmp r1, #0x00 cmp r1, #0x00
bne waitvalid bne waitvalid
ldr r0, =CM_CLKSEL1_PLL ldr r0, =CM_CLKSEL1_PLL
#ifdef PRCM_CONFIG_I #ifdef PRCM_CONFIG_I
ldr r1, =0x01837100 ldr r1, =0x01837100
#else #else
ldr r1, =0x01832100 ldr r1, =0x01832100
#endif #endif
str r1, [r0] str r1, [r0]
ldr r0, =PRCM_CLKCFG_CTRL ldr r0, =PRCM_CLKCFG_CTRL
mov r1, #0x01 mov r1, #0x01
str r1, [r0] str r1, [r0]
mov r6, #0x50 mov r6, #0x50
loop1: loop1:
subs r6, r6, #0x01 subs r6, r6, #0x01
cmp r6, #0x01 cmp r6, #0x01
bne loop1 bne loop1
ldr r0, =CM_CLKEN_PLL ldr r0, =CM_CLKEN_PLL
mov r1, #0x0f mov r1, #0x0f
str r1, [r0] str r1, [r0]
mov r6, #0x100 mov r6, #0x100
loop2: loop2:
subs r6, r6, #0x01 subs r6, r6, #0x01
cmp r6, #0x01 cmp r6, #0x01
bne loop2 bne loop2
ldr r0, =0x48008200 ldr r0, =0x48008200
ldr r1, =0xbfffffff ldr r1, =0xbfffffff

6
board/freescale/common/fsl_diu_fb.c
View File

@ -23,7 +23,6 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#include <common.h> #include <common.h>
#include <i2c.h> #include <i2c.h>
#include <malloc.h> #include <malloc.h>
@ -32,14 +31,12 @@
#include "fsl_diu_fb.h" #include "fsl_diu_fb.h"
#ifdef DEBUG #ifdef DEBUG
#define DPRINTF(fmt, args...) printf("%s: " fmt,__FUNCTION__,## args) #define DPRINTF(fmt, args...) printf("%s: " fmt,__FUNCTION__,## args)
#else #else
#define DPRINTF(fmt, args...) #define DPRINTF(fmt, args...)
#endif #endif
struct fb_videomode { struct fb_videomode {
const char *name; /* optional */ const char *name; /* optional */
unsigned int refresh; /* optional */ unsigned int refresh; /* optional */
@ -182,8 +179,6 @@ struct diu_addr {
#define MAX_CURS 32 #define MAX_CURS 32
static struct fb_info fsl_fb_info; static struct fb_info fsl_fb_info;
static struct diu_addr gamma, cursor; static struct diu_addr gamma, cursor;
static struct diu_ad fsl_diu_fb_ad __attribute__ ((aligned(32))); static struct diu_ad fsl_diu_fb_ad __attribute__ ((aligned(32)));
@ -206,7 +201,6 @@ static int fsl_diu_disable_panel(struct fb_info *info);
static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align); static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align);
static u32 get_busfreq(void); static u32 get_busfreq(void);
int fsl_diu_init(int xres, int fsl_diu_init(int xres,
unsigned int pixel_format, unsigned int pixel_format,
int gamma_fix, int gamma_fix,

18
include/configs/apollon.h
View File

@ -39,14 +39,14 @@
/* Clock config to target*/ /* Clock config to target*/
#define PRCM_CONFIG_I 1 #define PRCM_CONFIG_I 1
//#define PRCM_CONFIG_II 1 /* #define PRCM_CONFIG_II 1 */
/* Boot method */ /* Boot method */
/* uncomment if you use NOR boot */ /* uncomment if you use NOR boot */
//#define CFG_NOR_BOOT 1 /* #define CFG_NOR_BOOT 1 */
/* uncomment if you use NOR on CS3 */ /* uncomment if you use NOR on CS3 */
//#define CFG_USE_NOR 1 /* #define CFG_USE_NOR 1 */
#ifdef CFG_NOR_BOOT #ifdef CFG_NOR_BOOT
#undef CFG_USE_NOR #undef CFG_USE_NOR
@ -111,13 +111,13 @@
#define CFG_I2C_SLAVE 1 #define CFG_I2C_SLAVE 1
#define CONFIG_DRIVER_OMAP24XX_I2C #define CONFIG_DRIVER_OMAP24XX_I2C
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CFG_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} #define CFG_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
@ -180,8 +180,8 @@
#define CFG_LOAD_ADDR (OMAP2420_SDRC_CS0) /* default load address */ #define CFG_LOAD_ADDR (OMAP2420_SDRC_CS0) /* default load address */
/* The 2420 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) /* The 2420 has 12 GP timers, they can be driven by the SysClk (12/13/19.2)
* or by 32KHz clk, or from external sig. This rate is divided by a local * or by 32KHz clk, or from external sig. This rate is divided by a local
* divisor. * divisor.
*/ */
#define V_PVT 7 /* use with 12MHz/128 */ #define V_PVT 7 /* use with 12MHz/128 */
@ -193,7 +193,7 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Stack sizes * Stack sizes
* *
* The stack sizes are set up in start.S using the settings below * The stack sizes are set up in start.S using the settings below
*/ */
#define CONFIG_STACKSIZE SZ_128K /* regular stack */ #define CONFIG_STACKSIZE SZ_128K /* regular stack */
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
@ -223,7 +223,7 @@
*/ */
# define CFG_FLASH_CFI 1 /* Flash memory is CFI compliant */ # define CFG_FLASH_CFI 1 /* Flash memory is CFI compliant */
# define CFG_FLASH_CFI_DRIVER 1 /* Use drivers/cfi_flash.c */ # define CFG_FLASH_CFI_DRIVER 1 /* Use drivers/cfi_flash.c */
//#define CFG_FLASH_USE_BUFFER_WRITE 1 /* Use buffered writes (~10x faster) */ /* #define CFG_FLASH_USE_BUFFER_WRITE 1 */ /* Use buffered writes (~10x faster) */
# define CFG_FLASH_PROTECTION 1 /* Use h/w sector protection*/ # define CFG_FLASH_PROTECTION 1 /* Use h/w sector protection*/
#else /* !CFG_USE_NOR */ #else /* !CFG_USE_NOR */