Menu
▾
▴
blob-cvs-commit — blob CVS commit messages list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(79) |
Aug
(27) |
Sep
(64) |
Oct
(202) |
Nov
(31) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(125) |
Feb
(173) |
Mar
(13) |
Apr
(140) |
May
(75) |
Jun
(1) |
Jul
(37) |
Aug
(14) |
Sep
|
Oct
(20) |
Nov
(9) |
Dec
(2) |
| 2003 |
Jan
(51) |
Feb
(12) |
Mar
(18) |
Apr
(24) |
May
(1) |
Jun
|
Jul
|
Aug
(72) |
Sep
(12) |
Oct
(18) |
Nov
(60) |
Dec
(26) |
| 2004 |
Jan
(1) |
Feb
(40) |
Mar
(3) |
Apr
(3) |
May
|
Jun
(1) |
Jul
(4) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(5) |
| 2006 |
Jan
(13) |
Feb
(5) |
Mar
(8) |
Apr
(13) |
May
(7) |
Jun
(6) |
Jul
(10) |
Aug
(6) |
Sep
(6) |
Oct
(35) |
Nov
(20) |
Dec
(10) |
| 2007 |
Jan
(13) |
Feb
(9) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(2) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(54) |
Jun
(78) |
Jul
(35) |
Aug
(21) |
Sep
(21) |
Oct
(29) |
Nov
(10) |
Dec
(5) |
| 2010 |
Jan
|
Feb
|
Mar
(26) |
Apr
(55) |
May
(73) |
Jun
(63) |
Jul
(38) |
Aug
(39) |
Sep
(19) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2011 |
Jan
(2) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Stefan E. <se...@us...> - 2003-11-11 14:30:48
|
Update of /cvsroot/blob/blob/src/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv9742
Modified Files:
ether-smc9196.c
Log Message:
Bugfix: smctest should use the configured base address, not some
random #define.
Index: ether-smc9196.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/ether-smc9196.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ether-smc9196.c 4 Sep 2003 01:10:24 -0000 1.1
+++ ether-smc9196.c 11 Nov 2003 14:30:45 -0000 1.2
@@ -584,7 +584,7 @@
*/
static int smctest( int argc, char *argv[] )
{
- u32 base = SMC_BASE;
+ u32 base = smc9196_ether_driver.base;
u8 hw_addr_set[6] = { 2,3,4,5,6,7 };
//u8 hw_addr_set[6] = { 0x00, 0x50, 0x7f, 0x01, 0xcf, 0x0f };
u8 hw_addr[6];
|
|
From: Stefan E. <se...@us...> - 2003-11-11 14:27:16
|
Update of /cvsroot/blob/blob/include/blob/arch In directory sc8-pr-cvs1:/tmp/cvs-serv9071/include/blob/arch Modified Files: ra_alpha.h Log Message: Fix silly typos. Fix CCCR setting. Add CPLD register definitions. Index: ra_alpha.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/ra_alpha.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ra_alpha.h 11 Nov 2003 12:40:55 -0000 1.3 +++ ra_alpha.h 11 Nov 2003 14:27:12 -0000 1.4 @@ -74,23 +74,59 @@ #define RAMDISK_SIZE (4 * 1024) #if 1 /* Full Speed */ -// #define MDREFR_VALUE 0x0009f018 -// #define MDCNFG_VALUE 0x000019c9 +//# define MDREFR_VALUE 0x0009f018 +//# define MDCNFG_VALUE 0x000019c9 # define MDCNFG_VALUE ( MDCNFG_DE0 | MDCNFG_DCAC0(1) | MDCNFG_DRAC0(2) | \ - MDCNFG_DNB0 | MDCNFG_DTC0(1) ) + MDCNFG_DNB0 | MDCNFG_DTC0(1) | MDCNFG_DLATCH0 | \ + MDCNFG_DSA1111_0 ) # define MDREFR_VALUE ( MDREFR_DRI(24) | MDREFR_E0PIN | MDREFR_K0RUN | \ -# MDREFR_K0DB2 | MDREFR_E1PIN | MDREFR_K1RUN | \ -# MDREFR_K2DB2 ) + MDREFR_K0DB2 | MDREFR_E1PIN | MDREFR_K1RUN | \ + MDREFR_K2DB2 ) #define MDMRS_VALUE 0x00020002 -#define CCCR_VALUE ( CCCR_L(27) | CCCR_M(4) | CCCR_N(1) ) +/* L=27, M=4, N=1 */ +#define CCCR_VALUE ( CCCR_L(1) | CCCR_M(3) | CCCR_N(2) ) #else /* SDRAM at half speed */ # define MDCNFG_VALUE ( MDCNFG_DE0 | MDCNFG_DCAC0(1) | MDCNFG_DRAC0(2) | \ MDCNFG_DNB0 | MDCNFG_DTC0(1) ) # define MDREFR_VALUE ( MDREFR_DRI(24) | MDREFR_E0PIN | MDREFR_K0RUN | \ -# MDREFR_K0DB2 | MDREFR_E1PIN | MDREFR_K1RUN | \ -# MDREFR_K1DB2 | MDREFR_K2DB2 ) + MDREFR_K0DB2 | MDREFR_E1PIN | MDREFR_K1RUN | \ + MDREFR_K1DB2 | MDREFR_K2DB2 ) # define MDMRS_VALUE 0x00020002 #endif + +/* + * RotAlign CPLD registers + */ +#define RA_CPLD_BASE (PXA_CS2_PHYS) +#define RA_CTRL0 (RA_CPLD_BASE + 0x90) +#define RA_CTRL1 (RA_CPLD_BASE + 0xA0) + +/* CTRL0 */ +#define RA_CTRL0_USBSLAVE ( 1<<0 ) +#define RA_CTRL0_X1 ( 1<<1 ) +#define RA_CTRL0_X2 ( 1<<2 ) +#define RA_CTRL0_nLAN_EN ( 1<<3 ) +#define RA_CTRL0_X4 ( 1<<4 ) +#define RA_CTRL0_X5 ( 1<<5 ) +#define RA_CTRL0_X6 ( 1<<6 ) +#define RA_CTRL0_LCD_EN ( 1<<7 ) + + +/* CTRL 1 */ +#define RA_CTRL1_RS3_MUX(x) ( (((u_char)x)&0x03)<<0 ) +#define RA_CTRL1_RS3_MUX0 ( 1<<0 ) +#define RA_CTRL1_RS3_MUX1 ( 1<<1 ) +#define RA_CTRL1_nSRST ( 1<<2 ) +#define RA_CTRL1_RS3_RS485_TERM ( 1<<3 ) +#define RA_CTRL1_BEEP ( 1<<4 ) +#define RA_CTRL1_LCD_POWER ( 1<<5 ) +#define RA_CTRL1_6 ( 1<<6 ) +#define RA_CTRL1_7 ( 1<<7 ) + +/* Some shorthand macros */ +#define MEM( x ) (*((u32 *)(x))) +#define SET(reg,bit) ((reg) |= (1<<(bit))) +#define RST(reg,bit) ((reg) &= ~(1<<(bit))) /* GPIO configuration */ #define GPIO0_VALUE GPIO_OUT_LO |
|
From: Stefan E. <se...@us...> - 2003-11-11 12:45:51
|
Update of /cvsroot/blob/blob/src/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv20993
Modified Files:
ether.c
Log Message:
Bugfix: return NULL on error.
Index: ether.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/ether.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ether.c 4 Sep 2003 18:55:53 -0000 1.4
+++ ether.c 11 Nov 2003 12:45:48 -0000 1.5
@@ -96,7 +96,7 @@
char *ether_get_name(void)
{
- if (!ether_driver) return -EINVAL;
+ if (!ether_driver) return NULL;
return ether_driver->name;
}
|
|
From: Stefan E. <se...@us...> - 2003-11-11 12:40:58
|
Update of /cvsroot/blob/blob/include/blob/arch In directory sc8-pr-cvs1:/tmp/cvs-serv19908 Modified Files: ra_alpha.h Log Message: Use defines from pxa-regs.h for better readability. Define IRQ GPIOs as input (first shot). Index: ra_alpha.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/ra_alpha.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ra_alpha.h 10 Nov 2003 20:54:25 -0000 1.2 +++ ra_alpha.h 11 Nov 2003 12:40:55 -0000 1.3 @@ -73,41 +73,37 @@ /* the size (in kbytes) to which the compressed ramdisk expands */ #define RAMDISK_SIZE (4 * 1024) -#define MDREFR_VALUE 0x0009f018 -#define MDCNFG_VALUE 0x000019c9 +#if 1 /* Full Speed */ +// #define MDREFR_VALUE 0x0009f018 +// #define MDCNFG_VALUE 0x000019c9 +# define MDCNFG_VALUE ( MDCNFG_DE0 | MDCNFG_DCAC0(1) | MDCNFG_DRAC0(2) | \ + MDCNFG_DNB0 | MDCNFG_DTC0(1) ) +# define MDREFR_VALUE ( MDREFR_DRI(24) | MDREFR_E0PIN | MDREFR_K0RUN | \ +# MDREFR_K0DB2 | MDREFR_E1PIN | MDREFR_K1RUN | \ +# MDREFR_K2DB2 ) #define MDMRS_VALUE 0x00020002 -/* L=27, M=4, N=1 */ -#define CCCR_VALUE 0x00000161 - -#if 0 -#define MDREFR_VAL 0x00018018 -#define MDCNFG_VAL 0x00001AC9 -#define MDMRS_VAL 0x00000000 -#define MSC0_VAL 0x23F223F2 -#define MSC1_VAL 0x3FF1A441 -#define MSC2_VAL 0x7FF17FF1 -#define MECR_VAL 0x00000000 -#define MCMEM0_VAL 0x00010504 -#define MCMEM1_VAL 0x00010504 -#define MCATT0_VAL 0x00010504 -#define MCATT1_VAL 0x00010504 -#define MCIO0_VAL 0x00004715 -#define MCIO1_VAL 0x00004715 +#define CCCR_VALUE ( CCCR_L(27) | CCCR_M(4) | CCCR_N(1) ) +#else /* SDRAM at half speed */ +# define MDCNFG_VALUE ( MDCNFG_DE0 | MDCNFG_DCAC0(1) | MDCNFG_DRAC0(2) | \ + MDCNFG_DNB0 | MDCNFG_DTC0(1) ) +# define MDREFR_VALUE ( MDREFR_DRI(24) | MDREFR_E0PIN | MDREFR_K0RUN | \ +# MDREFR_K0DB2 | MDREFR_E1PIN | MDREFR_K1RUN | \ +# MDREFR_K1DB2 | MDREFR_K2DB2 ) +# define MDMRS_VALUE 0x00020002 #endif - /* GPIO configuration */ #define GPIO0_VALUE GPIO_OUT_LO #define GPIO1_VALUE GPIO_OUT_LO #define GPIO2_VALUE GPIO_OUT_LO -#define GPIO3_VALUE GPIO_INPUT /* eth_wakeup */ -#define GPIO4_VALUE GPIO_INPUT /* bank_switch_int */ -#define GPIO5_VALUE GPIO_INPUT /* eth_link_status */ +#define GPIO3_VALUE GPIO_INPUT /* USB IRQ */ +#define GPIO4_VALUE GPIO_INPUT /* LAN IRQ (neg) */ +#define GPIO5_VALUE GPIO_INPUT /* CF IRQ (neg) */ #define GPIO6_VALUE GPIO_OUT_LO -#define GPIO7_VALUE GPIO_OUT_LO /* cpld_clk */ +#define GPIO7_VALUE GPIO_OUT_LO #define GPIO8_VALUE GPIO_OUT_LO -#define GPIO9_VALUE GPIO_INPUT /* eth_int */ -#define GPIO10_VALUE GPIO_OUT_HI /* eth_reset */ +#define GPIO9_VALUE GPIO_OUT_LO +#define GPIO10_VALUE GPIO_OUT_LO #define GPIO11_VALUE GPIO_OUT_LO #define GPIO12_VALUE GPIO_OUT_LO /* watchdog_strobe */ #define GPIO13_VALUE GPIO_INPUT /* cpld_hw_reset */ @@ -122,7 +118,7 @@ #define GPIO22_VALUE GPIO_OUT_LO #define GPIO23_VALUE GPIO_OUT_LO #define GPIO24_VALUE GPIO_OUT_LO -#define GPIO25_VALUE GPIO_OUT_HI /* LED [debug] */ +#define GPIO25_VALUE GPIO_OUT_LO #define GPIO26_VALUE GPIO_OUT_LO #define GPIO27_VALUE GPIO_OUT_LO #define GPIO28_VALUE GPIO_OUT_LO |
|
From: Stefan E. <se...@us...> - 2003-11-11 12:31:12
|
Update of /cvsroot/blob/blob/include/blob/arch In directory sc8-pr-cvs1:/tmp/cvs-serv18268 Modified Files: pxa-regs.h Log Message: Added MDREFR_DRI and CCCR defines. Index: pxa-regs.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/pxa-regs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pxa-regs.h 4 Sep 2003 01:01:15 -0000 1.2 +++ pxa-regs.h 11 Nov 2003 12:31:09 -0000 1.3 @@ -1123,6 +1123,9 @@ #define CCCR_N_MASK 0x0380 /* Run Mode Frequency to Turbo Mode Frequency Multiplier */ #define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */ #define CCCR_L_MASK 0x001f /* Crystal Frequency to Memory Frequency Multiplier */ +#define CCCR_L(x) (((x)&0x1f) << 0 ) +#define CCCR_M(x) (((x)&3) << 5 ) +#define CCCR_N(x) (((x)&7) << 7 ) #define CKEN16_LCD (1 << 16) /* LCD Unit Clock Enable */ #define CKEN14_I2C (1 << 14) /* I2C Unit Clock Enable */ @@ -1352,6 +1355,7 @@ #define MDREFR_K0DB2 (1 << 14) /* SDCLK0 Divide by 2 Control/Status */ #define MDREFR_K0RUN (1 << 13) /* SDCLK0 Run Control/Status */ #define MDREFR_E0PIN (1 << 12) /* SDCKE0 Level Control/Status */ +#define MDREFR_DRI(x) (((x)&0xfff) << 0 ) /* SDRAM refresh interval */ #define MSC_RT Fld(2,0) /* ROM type */ #define MSC_NonBrst (0 << FShft (MSC_RT)) |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:59:41
|
Update of /cvsroot/blob/blob/src/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv15788
Modified Files:
dafit.c
Log Message:
Fix dafit timer driver mess.
Split driver selection from HW init, as every other board does.
Fix init levels.
Index: dafit.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/dafit.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dafit.c 4 Sep 2003 17:39:00 -0000 1.5
+++ dafit.c 10 Nov 2003 20:59:35 -0000 1.6
@@ -204,17 +204,23 @@
static char module_version[] = "$Id$";
/*********************************************************************
- * init_dafit_flash - inits system 3 flash driver
+ * dafit driver selection
*/
-static void init_dafit_flash_driver(void)
+static void dafit_driver_select(void)
{
+ /* select drivers */
flash_descriptors = dafit_flash_descriptors;
flash_driver = &intel32_flash_driver;
+ reboot_driver = &sa11x0_reboot_driver;
+ serial_driver = &sa11x0_serial_driver;
+ led_driver = &sa11x0_gpio_led_driver;
+ ether_driver = &smc9196_ether_driver;
+ timer_driver = &intelarm_timer_driver;
}
-__initlist(init_dafit_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
+__initlist(dafit_driver_select, INIT_LEVEL_DRIVER_SELECTION);
/*********************************************************************
- * dafit_init_hardware - inits system 3 LL hardware stuff
+ * dafit_init_hardware - inits dafit LL hardware stuff
*/
static void dafit_init_hardware(void)
{
@@ -260,14 +266,8 @@
/* tweak blob config */
blob_status.boot_delay = 1;
- /* select drivers */
- reboot_driver = &sa11x0_reboot_driver;
- serial_driver = &sa11x0_serial_driver;
- led_driver = &sa11x0_gpio_led_driver;
- ether_driver = &smc9196_ether_driver;
- timer_driver = &intelarm_timer_driver;
}
-__initlist(dafit_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
+__initlist(dafit_init_hardware, INIT_LEVEL_OTHER_HARDWARE);
/**********************************************************************
* dafit default partition table
|
|
From: Stefan E. <se...@us...> - 2003-11-10 20:58:39
|
Update of /cvsroot/blob/blob/src/blob In directory sc8-pr-cvs1:/tmp/cvs-serv15426 Modified Files: initcalls.c Log Message: Change init level of timer driver. Timer drivers are INITIAL_HARDWARE IMHO. This change does not break any platform but the (already broken) dafit board. Index: initcalls.c =================================================================== RCS file: /cvsroot/blob/blob/src/blob/initcalls.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- initcalls.c 4 Sep 2003 17:39:00 -0000 1.7 +++ initcalls.c 10 Nov 2003 20:58:35 -0000 1.8 @@ -45,7 +45,7 @@ __initlist(serial_default_init, INIT_LEVEL_INITIAL_HARDWARE); __initlist(enable_icache, INIT_LEVEL_INITIAL_HARDWARE); __initlist(led_init, INIT_LEVEL_INITIAL_HARDWARE); -__initlist(timer_init, INIT_LEVEL_OTHER_HARDWARE); +__initlist(timer_init, INIT_LEVEL_INITIAL_HARDWARE); #if defined( CONFIG_GIO_SUPPORT ) __initlist(init_flash_io, INIT_LEVEL_OTHER_STUFF + 2); |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:54:28
|
Update of /cvsroot/blob/blob/src/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv14776/src/blob
Modified Files:
ra_alpha.c
Log Message:
Remove old LED stuf. Fix defines, memory config.
Add proper partition support.
Index: ra_alpha.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/ra_alpha.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ra_alpha.c 5 Nov 2003 10:09:45 -0000 1.1
+++ ra_alpha.c 10 Nov 2003 20:54:25 -0000 1.2
@@ -40,57 +40,11 @@
#include <blob/partition.h>
#include <blob/time.h>
-#define GPIO25_LED GPIO_bit(0)
-
-static int led_state;
-static int led_locked;
-
-static void rt_alpha_led_on (void)
-{
- if (!led_locked) {
- GPSR0 = GPIO25_LED;
- led_state = 1;
- }
-}
-
-static void rt_alpha_led_off (void)
-{
- if (!led_locked) {
- GPCR0 = GPIO25_LED;
- led_state = 0;
- }
-}
-
-static void rt_alpha_led_toggle (void)
-{
- if (led_state)
- rt_alpha_led_off ();
- else
- rt_alpha_led_on ();
-}
-
-static void rt_alpha_led_lock (void)
-{
- led_locked = 1;
-}
-
-static void rt_alpha_led_unlock (void)
-{
- led_locked = 0;
-}
-
static void rt_alpha_init_driver (void)
{
- static led_driver_t rt_alpha_led_driver = {
- .led_on = rt_alpha_led_on,
- .led_off = rt_alpha_led_off,
- .led_toggle = rt_alpha_led_toggle,
- .led_lock = rt_alpha_led_lock,
- .led_unlock = rt_alpha_led_unlock
- };
static const flash_descriptor_t flash[] = {
{
- .size = 128 * 1024,
+ .size = 2 * 128 * 1024,
.num = 64,
.lockable = 1
},
@@ -102,57 +56,75 @@
.next = sizeof (blob_partition_t),
.offset = 0x00000000,
.size = BLOB_PART_SIZ_FULL
- }, {
- .magic = BLOB_PART_VALID_MAGIC,
- .next = sizeof (blob_partition_t),
- .offset = BLOB_PART_OFS_APPEND,
- .size = BLOB_FLASH_LEN,
- .name = "blob",
- .mem_base = BLOB_RAM_BASE
- }, {
- .magic = BLOB_PART_VALID_MAGIC,
- .next = sizeof (blob_partition_t),
- .offset = BLOB_PART_OFS_APPEND,
- .size = PARAM_FLASH_LEN,
- .name = "param",
- .flags = BLOB_PART_FLAG_PTABLE
- }, {
- .magic = BLOB_PART_VALID_MAGIC,
- .next = sizeof (blob_partition_t),
- .offset = BLOB_PART_OFS_APPEND,
- .size = KERNEL_FLASH_LEN,
- .name = "kernel",
- .flags = BLOB_PART_FLAG_EXEC,
- .mem_base = KERNEL_RAM_BASE,
- .entry_point= KERNEL_RAM_BASE
- }, {
- .magic = BLOB_PART_VALID_MAGIC,
- .next = sizeof (blob_partition_t),
- .offset = BLOB_PART_OFS_APPEND,
- .size = RAMDISK_FLASH_LEN,
- .name = "ramdisk",
- .flags = BLOB_PART_FLAG_LOAD,
- .mem_base = RAMDISK_RAM_BASE
- }, {
- .magic = BLOB_PART_VALID_MAGIC,
- .next = sizeof (blob_partition_t),
- .offset = BLOB_PART_OFS_APPEND,
- .size = BLOB_PART_SIZ_FULL,
- .name = "jffs2",
- .flags = BLOB_PART_FLAG_JFFS2
- }, {
- .magic = BLOB_PART_LAST_MAGIC
+ },{
+ /* blob itself */
+ magic: BLOB_PART_VALID_MAGIC,
+ next: sizeof(blob_partition_t),
+ offset: BLOB_FLASH_BASE,
+ size: BLOB_FLASH_LEN,
+ name: "blob",
+ mem_base: BLOB_RAM_BASE
+ },
+ {
+ /* system config area */
+ magic: BLOB_PART_VALID_MAGIC,
+ next: sizeof(blob_partition_t),
+ offset: CONFIG_FLASH_BASE,
+ size: CONFIG_FLASH_LEN,
+ name: "config.tar",
+ flags: 0
+ },
+ {
+ /* kernel */
+ magic: BLOB_PART_VALID_MAGIC,
+ next: sizeof(blob_partition_t),
+ offset: KERNEL_FLASH_BASE,
+ size: KERNEL_FLASH_LEN,
+ name: "zImage",
+ flags: BLOB_PART_FLAG_LOAD | BLOB_PART_FLAG_EXEC,
+ mem_base: KERNEL_RAM_BASE,
+ entry_point: KERNEL_RAM_BASE
+ },
+ {
+ /* ramdisk */
+ magic: BLOB_PART_VALID_MAGIC,
+ next: sizeof(blob_partition_t),
+ offset: RAMDISK_FLASH_BASE,
+ size: RAMDISK_FLASH_LEN,
+ name: "initrd.gz",
+ flags: BLOB_PART_FLAG_LOAD,
+ mem_base: RAMDISK_RAM_BASE
+ },
+ {
+ /* root (cramfs) */
+ magic: BLOB_PART_VALID_MAGIC,
+ next: sizeof(blob_partition_t),
+ offset: ROOTFS_FLASH_BASE,
+ size: ROOTFS_FLASH_LEN,
+ name: "cramfs",
+ flags: BLOB_PART_FLAG_CRAMFS,
+ },
+ {
+ /* data (cramfs) */
+ magic: BLOB_PART_VALID_MAGIC,
+ next: sizeof(blob_partition_t),
+ offset: DATAFS_FLASH_BASE,
+ size: DATAFS_FLASH_LEN,
+ name: "data.img",
+ flags: BLOB_PART_FLAG_CRAMFS,
+ },
+ {
+ /* last entry */
+ magic: BLOB_PART_LAST_MAGIC
}
};
- GPDR0 |= GPIO25_LED;
-
flash_descriptors = flash;
reboot_driver = &pxa_reboot_driver;
serial_driver = &pxa_serial_driver;
flash_driver = &intel32_flash_driver;
- led_driver = &rt_alpha_led_driver;
+ led_driver = &pxa_gpio_led_driver;
timer_driver = &intelarm_timer_driver;
default_partition_table = partitions;
|
|
From: Stefan E. <se...@us...> - 2003-11-10 20:54:28
|
Update of /cvsroot/blob/blob/include/blob/arch In directory sc8-pr-cvs1:/tmp/cvs-serv14776/include/blob/arch Modified Files: ra_alpha.h Log Message: Remove old LED stuf. Fix defines, memory config. Add proper partition support. Index: ra_alpha.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/ra_alpha.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ra_alpha.h 5 Nov 2003 10:09:46 -0000 1.1 +++ ra_alpha.h 10 Nov 2003 20:54:25 -0000 1.2 @@ -24,12 +24,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef BLOB_ARCH_CSIR_IMS_H -#define BLOB_ARCH_CSIR_IMS_H +#ifndef BLOB_ARCH_RA_ALPHA_H +#define BLOB_ARCH_RA_ALPHA_H #define USE_SERIAL1 #define TERMINAL_SPEED baud_115200 +#define LED_GPIO (GPIO_bit(0)) + /* the base address were BLOB is loaded by the first stage loader */ #define BLOB_ABS_BASE_ADDR (0xa0200400) @@ -42,44 +44,60 @@ /* and where do they live in flash */ #define BLOB_FLASH_BASE (0x00000000) -#define BLOB_FLASH_LEN (128 * 1024) -#define PARAM_FLASH_BASE (BLOB_FLASH_BASE + BLOB_FLASH_LEN) -#define PARAM_FLASH_LEN (128 * 1024) -#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN) +#define BLOB_FLASH_LEN (256 * 1024) +#define PARAM_FLASH_BASE (0x00040000) +#define PARAM_FLASH_LEN (256 * 1024) +#define CONFIG_FLASH_BASE (0x00040000) +#define CONFIG_FLASH_LEN (256 * 1024) +#define KERNEL_FLASH_BASE (0x00080000) #define KERNEL_FLASH_LEN (1024 * 1024) -#define RAMDISK_FLASH_BASE (KERNEL_FLASH_BASE + KERNEL_FLASH_LEN) -#define RAMDISK_FLASH_LEN (4 * 1024 * 1024) +#define LOAD_RAMDISK 1 /* load ramdisk into ram */ +#define RAMDISK_FLASH_BASE (0x00180000) +#define RAMDISK_FLASH_LEN (1536 * 1024) +#define ROOTFS_FLASH_BASE (0x00300000) +#define ROOTFS_FLASH_LEN (0x00600000) /* 6M */ +#define DATAFS_FLASH_BASE (0x00900000) +#define DATAFS_FLASH_LEN (0x00700000) /* 7M */ /* this needs to be defined if you want parameter block support */ -#define PARAM_START PARAM_FLASH_BASE -#define PARAM_LEN PARAM_FLASH_LEN +// #define PARAM_START PARAM_FLASH_BASE +// #define PARAM_LEN PARAM_FLASH_LEN /* load ramdisk into ram */ #define LOAD_RAMDISK 1 +/* RAM pool for up/downloading */ +#define RAM_START (0xa2000000) +#define RAM_SIZE (16*1024*1024) + /* the size (in kbytes) to which the compressed ramdisk expands */ #define RAMDISK_SIZE (4 * 1024) +#define MDREFR_VALUE 0x0009f018 +#define MDCNFG_VALUE 0x000019c9 +#define MDMRS_VALUE 0x00020002 +/* L=27, M=4, N=1 */ +#define CCCR_VALUE 0x00000161 + #if 0 -#define MSC0_VALUE 0x -#define MSC1_VALUE 0x -#define MSC2_VALUE 0x -#define MECR_VALUE 0x -#define MCMEM0_VALUE 0x -#define MCMEM1_VALUE 0x -#define MCATT0_VALUE 0x -#define MCATT1_VALUE 0x -#define MCIO0_VALUE 0x -#define MCIO1_VALUE 0x +#define MDREFR_VAL 0x00018018 +#define MDCNFG_VAL 0x00001AC9 +#define MDMRS_VAL 0x00000000 +#define MSC0_VAL 0x23F223F2 +#define MSC1_VAL 0x3FF1A441 +#define MSC2_VAL 0x7FF17FF1 +#define MECR_VAL 0x00000000 +#define MCMEM0_VAL 0x00010504 +#define MCMEM1_VAL 0x00010504 +#define MCATT0_VAL 0x00010504 +#define MCATT1_VAL 0x00010504 +#define MCIO0_VAL 0x00004715 +#define MCIO1_VAL 0x00004715 #endif -#define MDREFR_VALUE 0x01018013 -#define MDCNFG_VALUE 0x000019c9 -#define MDMRS_VALUE 0x00020002 /* GPIO configuration */ -/*#define GPIO0_VALUE GPIO_OUT_LO*/ -#define GPIO0_VALUE GPIO_OUT_HI +#define GPIO0_VALUE GPIO_OUT_LO #define GPIO1_VALUE GPIO_OUT_LO #define GPIO2_VALUE GPIO_OUT_LO #define GPIO3_VALUE GPIO_INPUT /* eth_wakeup */ @@ -114,8 +132,8 @@ #define GPIO32_VALUE GPIO_OUT_LO #define GPIO33_VALUE GPIO_OUT_HI /* nCS5 [unused] */ #define GPIO34_VALUE (GPIO_INPUT | GPIO_ALT_FN1) /* FFRXD */ -#define GPIO35_VALUE GPIO_OUT_LO -#define GPIO36_VALUE GPIO_OUT_LO +#define GPIO35_VALUE GPIO_OUT_HI /* Core Voltage */ +#define GPIO36_VALUE GPIO_OUT_HI /* Core Voltage */ #define GPIO37_VALUE GPIO_OUT_LO #define GPIO38_VALUE GPIO_OUT_LO #define GPIO39_VALUE (GPIO_OUT_LO | GPIO_ALT_FN2) /* FFTXD */ @@ -165,4 +183,4 @@ #define GPIO83_VALUE GPIO_OUT_LO #define GPIO84_VALUE GPIO_OUT_LO -#endif /* #ifndef BLOB_ARCH_CSIR_IMS_H */ +#endif /* #ifndef BLOB_ARCH_RA_ALPHA_H */ |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:53:06
|
Update of /cvsroot/blob/blob/src/blob In directory sc8-pr-cvs1:/tmp/cvs-serv14605 Modified Files: memsetup-pxa.S Log Message: Set CCCR register if defined. Index: memsetup-pxa.S =================================================================== RCS file: /cvsroot/blob/blob/src/blob/memsetup-pxa.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- memsetup-pxa.S 7 Aug 2003 19:46:54 -0000 1.1 +++ memsetup-pxa.S 10 Nov 2003 20:53:02 -0000 1.2 @@ -68,6 +68,13 @@ /* wait for internal clocks to stabilize */ wait +#ifdef CCCR_VALUE + ldr r1, =0x41300000 + ldr r0, =CCCR_VALUE + str r0, [r1, #0] + wait +#endif + ldr r1, =0x48000000 /* write MSC0, read back to ensure data latches */ @@ -165,7 +172,9 @@ orr r4, r4, #0x00010000 /* set K1DB2 (SDClk[1] = MemClk/2) */ +#if 0 orreq r4, r4, #0x00020000 +#endif /* write back MDREFR */ str r4, [r1, #MDREFR_OFFSET] |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:50:26
|
Update of /cvsroot/blob/blob/include/blob/arch In directory sc8-pr-cvs1:/tmp/cvs-serv13935/include/blob/arch Modified Files: csir_ims.h Log Message: Fix csir_ims board to use ledasm-pxa.S and pxa_gpio_led_driver. Index: csir_ims.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/csir_ims.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- csir_ims.h 7 Aug 2003 19:30:59 -0000 1.2 +++ csir_ims.h 10 Nov 2003 20:50:23 -0000 1.3 @@ -26,6 +26,7 @@ #define USE_SERIAL1 #define TERMINAL_SPEED baud_115200 +#define LED_GPIO GPIO_bit(25) /* the base address were BLOB is loaded by the first stage loader */ #define BLOB_ABS_BASE_ADDR (0xa0200400) |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:50:26
|
Update of /cvsroot/blob/blob/src/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv13935/src/blob
Modified Files:
csir_ims.c
Log Message:
Fix csir_ims board to use ledasm-pxa.S and pxa_gpio_led_driver.
Index: csir_ims.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/csir_ims.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- csir_ims.c 4 Sep 2003 17:39:00 -0000 1.3
+++ csir_ims.c 10 Nov 2003 20:50:23 -0000 1.4
@@ -40,54 +40,8 @@
#include <blob/partition.h>
#include <blob/time.h>
-#define GPIO25_LED GPIO_bit(25)
-
-static int led_state;
-static int led_locked;
-
-static void csir_ims_led_on (void)
-{
- if (!led_locked) {
- GPSR0 = GPIO25_LED;
- led_state = 1;
- }
-}
-
-static void csir_ims_led_off (void)
-{
- if (!led_locked) {
- GPCR0 = GPIO25_LED;
- led_state = 0;
- }
-}
-
-static void csir_ims_led_toggle (void)
-{
- if (led_state)
- csir_ims_led_off ();
- else
- csir_ims_led_on ();
-}
-
-static void csir_ims_led_lock (void)
-{
- led_locked = 1;
-}
-
-static void csir_ims_led_unlock (void)
-{
- led_locked = 0;
-}
-
static void csir_ims_init_driver (void)
{
- static led_driver_t csir_ims_led_driver = {
- .led_on = csir_ims_led_on,
- .led_off = csir_ims_led_off,
- .led_toggle = csir_ims_led_toggle,
- .led_lock = csir_ims_led_lock,
- .led_unlock = csir_ims_led_unlock
- };
static const flash_descriptor_t flash[] = {
{
.size = 128 * 1024,
@@ -145,14 +99,12 @@
}
};
- GPDR0 |= GPIO25_LED;
-
flash_descriptors = flash;
reboot_driver = &pxa_reboot_driver;
serial_driver = &pxa_serial_driver;
flash_driver = &intel16_flash_driver;
- led_driver = &csir_ims_led_driver;
+ led_driver = &pxa_gpio_led_driver;
timer_driver = &intelarm_timer_driver;
default_partition_table = partitions;
|
|
From: Stefan E. <se...@us...> - 2003-11-10 20:50:26
|
Update of /cvsroot/blob/blob In directory sc8-pr-cvs1:/tmp/cvs-serv13935 Modified Files: configure.in Log Message: Fix csir_ims board to use ledasm-pxa.S and pxa_gpio_led_driver. Index: configure.in =================================================================== RCS file: /cvsroot/blob/blob/configure.in,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- configure.in 10 Nov 2003 17:06:40 -0000 1.77 +++ configure.in 10 Nov 2003 20:50:23 -0000 1.78 @@ -399,6 +399,8 @@ AC_DEFINE(CSIR_IMS,1,[CSIR Incident Management System]) BLOB_PLATFORM_OBJS="csir_ims.o" BLOB_FLASH_OBJS="intel16.o" + BLOB_LED_DRIVER_OBJS="led-pxa.o" + BLOB_LED_STARTCODE="ledasm-pxa.o" DIAG_PLATFORM_OBJS="csir_ims.o" use_cpu="pxa250" use_lcd="no" |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:45:40
|
Update of /cvsroot/blob/blob/src/blob In directory sc8-pr-cvs1:/tmp/cvs-serv13151 Modified Files: ledasm-pxa.S Log Message: fix asm. No stack, dammit. ;) Index: ledasm-pxa.S =================================================================== RCS file: /cvsroot/blob/blob/src/blob/ledasm-pxa.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ledasm-pxa.S 10 Nov 2003 17:06:40 -0000 1.1 +++ ledasm-pxa.S 10 Nov 2003 20:45:37 -0000 1.2 @@ -1,5 +1,5 @@ /* - * ledasm-sa11x0.S: simple LED control code + * ledasm-pxa.S: simple LED control code * * Copyright (C) 2001 Erik Mouw (J.A...@it...) * Copyright (C) 2003 Stefan Eletzhofer <ste...@in...> @@ -46,7 +46,9 @@ ldr r0, [r1] orr r0, r0, #LED_GPIO str r0, [r1] - bl led_off + ldr r1, =GPCR0 + mov r0, #LED_GPIO + str r0, [r1] mov pc, lr |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:44:20
|
Update of /cvsroot/blob/blob/src/blob In directory sc8-pr-cvs1:/tmp/cvs-serv12791 Modified Files: start-pxa.S Log Message: remove old LED code. Use ledasm-pxa.S now. Index: start-pxa.S =================================================================== RCS file: /cvsroot/blob/blob/src/blob/start-pxa.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- start-pxa.S 7 Aug 2003 19:31:01 -0000 1.3 +++ start-pxa.S 10 Nov 2003 20:44:16 -0000 1.4 @@ -37,10 +37,23 @@ */ .macro blink, count - mov r3, \count + mov r6, \count b endless_blink .endm +.macro wait, count + mov r0, \count +0: + subs r0, r0, #1 + bne 0b +.endm + +.macro blinky, count + wait #0x800000 + mov r0, \count + bl led_blink +.endm + .globl reset reset: /* First, mask **ALL** interrupts */ @@ -50,90 +63,49 @@ real_reset: bl gpiosetup - bl ledsetup + bl ledinit bl memsetup bl normal_boot - - blink #1 + blink #2 .globl undefined_instruction undefined_instruction: - blink #2 + blink #3 .globl software_interrupt software_interrupt: - blink #3 + blink #4 .globl prefetch_abort prefetch_abort: - blink #4 + blink #5 .globl data_abort data_abort: - blink #5 + blink #6 .globl not_used not_used: - blink #6 + blink #7 .globl irq irq: - blink #7 + blink #8 .globl fiq fiq: - blink #8 - -#define GPIO25_LED GPIO_bit(25) - -ledset: -#ifdef CSIR_IMS - ldr r1, =GPSR0 - mov r0, #GPIO25_LED - str r0, [r1] -#endif - mov pc, lr - -ledclear: -#ifdef CSIR_IMS - ldr r1, =GPCR0 - mov r0, #GPIO25_LED - str r0, [r1] -#endif - mov pc, lr - -ledsetup: - mov r2, lr -#ifdef CSIR_IMS - ldr r1, =GPDR0 - ldr r0, [r1] - orr r0, r0, #GPIO25_LED - str r0, [r1] -#endif - bl ledclear - mov pc, r2 - -.macro wait, count - mov r0, \count -0: - subs r0, r0, #1 - bne 0b -.endm - -ledflash: - mov r2, lr - bl ledset - wait #0x400000 - bl ledclear - wait #0x400000 - mov pc, r2 + blink #9 +/* endless loop that blinks the LED. r6 contains the number of blinks */ +.globl endless_blink endless_blink: - mov r4, r3 -0: - bl ledflash - subs r4, r4, #1 - bne 0b - wait #0x2000000 - b endless_blink + wait #0x800000 + mov r0, r6 + bl led_blink + b endless_blink +do_blink: + mov r5, lr + wait #0x800000 + bl led_blink + mov pc, r5 |
|
From: Stefan E. <se...@us...> - 2003-11-10 20:43:08
|
Update of /cvsroot/blob/blob/doc In directory sc8-pr-cvs1:/tmp/cvs-serv12516/doc Added Files: blinkencodes.txt Log Message: document blinkencodes currently used by blob. --- NEW FILE: blinkencodes.txt --- Blinkencodes defined in BLOB ============================ Please try to keep them consistent over different platforms. Code reason ----------------------------------------------------------- 1 not used 2 normal_boot in start-<platform>.S returned 3 undefined instruction trap 4 software IRQ 5 prefetch abort trap 6 data_abort trap 7 unused ?? 8 IRQ 9 FIQ 10 testmem found bad memory (start.S) 11 second stage loader returned (start.s) (morse algo someone? ;-) --- $Id: blinkencodes.txt,v 1.1 2003/11/10 20:43:03 seletz Exp $ |
|
From: Stefan E. <se...@us...> - 2003-11-10 17:31:53
|
Update of /cvsroot/blob/blob/src/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv843/src/lib
Modified Files:
led-pxa.c
Log Message:
add pxa led driver
make driver non-static
Index: led-pxa.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/led-pxa.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- led-pxa.c 10 Nov 2003 17:06:41 -0000 1.1
+++ led-pxa.c 10 Nov 2003 17:31:49 -0000 1.2
@@ -75,7 +75,7 @@
led_locked = 0;
}
-static led_driver_t pxa_gpio_led_driver = {
+led_driver_t pxa_gpio_led_driver = {
.led_on = pxa_led_on,
.led_off = pxa_led_off,
.led_toggle = pxa_led_toggle,
|
|
From: Stefan E. <se...@us...> - 2003-11-10 17:31:52
|
Update of /cvsroot/blob/blob/include/blob In directory sc8-pr-cvs1:/tmp/cvs-serv843/include/blob Modified Files: led.h Log Message: add pxa led driver make driver non-static Index: led.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/led.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- led.h 4 Sep 2003 18:03:09 -0000 1.6 +++ led.h 10 Nov 2003 17:31:49 -0000 1.7 @@ -51,10 +51,8 @@ /* implemented LED drivers */ extern led_driver_t s3c2500_gpio_led_driver; extern led_driver_t sa11x0_gpio_led_driver; +extern led_driver_t pxa_gpio_led_driver; extern led_driver_t mmap_led_driver; - -/* FIXME: This still needs to be implemented */ -/* extern led_driver_t pxa_gpio_led_driver; */ /* defined in arch specific file */ extern led_driver_t *led_driver; |
|
From: Stefan E. <se...@us...> - 2003-11-10 17:06:45
|
Update of /cvsroot/blob/blob/src/blob In directory sc8-pr-cvs1:/tmp/cvs-serv27097/src/blob Modified Files: Makefile.am Added Files: ledasm-pxa.S Log Message: pxa led breakout --- NEW FILE: ledasm-pxa.S --- /* * ledasm-sa11x0.S: simple LED control code * * Copyright (C) 2001 Erik Mouw (J.A...@it...) * Copyright (C) 2003 Stefan Eletzhofer <ste...@in...> * * based on start-pxa.s Copyright (C) 2002 Intel Corporation * Written by Rusty Geldmacher (rus...@in...) * * $Id: ledasm-pxa.S,v 1.1 2003/11/10 17:06:40 seletz Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ .ident "$Id: ledasm-pxa.S,v 1.1 2003/11/10 17:06:40 seletz Exp $" #ifdef HAVE_CONFIG_H # include <blob/config.h> #endif #include <blob/arch.h> .globl ledinit /* initialise LED GPIO and turn LED on. * clobbers r0 and r1 */ ledinit: #if defined (NO_GPIO_LED_SUPPORT) mov pc, lr #endif ldr r1, =GPDR0 ldr r0, [r1] orr r0, r0, #LED_GPIO str r0, [r1] bl led_off mov pc, lr .globl led_on /* turn LED on. clobbers r0 and r1 */ led_on: #if defined (NO_GPIO_LED_SUPPORT) mov pc, lr #endif ldr r1, =GPSR0 mov r0, #LED_GPIO str r0, [r1] mov pc, lr .globl led_off /* turn LED off. clobbers r0 - r2 */ led_off: #if defined (NO_GPIO_LED_SUPPORT) mov pc, lr #endif ldr r1, =GPCR0 mov r0, #LED_GPIO str r0, [r1] mov pc, lr /* busy wait loop. clobbers r0 */ wait_loop: mov r0, #0x400000 wait_loop1: subs r0, r0, #1 bne wait_loop1 mov pc, lr blinky: /* blink LED. clobbers r0 and r1 */ mov r2, lr bl led_on bl wait_loop bl led_off bl wait_loop mov pc, r2 .globl led_blink /* blinks LED r0 times */ /* clobbers r0 - r4 */ led_blink: #if defined (NO_GPIO_LED_SUPPORT) mov pc, lr #endif mov r4, lr mov r3, r0 /* switch LED off if it wasn't already off */ bl led_off bl wait_loop blink0: bl blinky subs r3, r3, #1 bne blink0 mov pc, r4 Index: Makefile.am =================================================================== RCS file: /cvsroot/blob/blob/src/blob/Makefile.am,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Makefile.am 5 Nov 2003 10:09:45 -0000 1.47 +++ Makefile.am 10 Nov 2003 17:06:41 -0000 1.48 @@ -150,13 +150,15 @@ ledasm-mmap.S \ ledasm-s3c2500.S \ ledasm-sa11x0.S \ + ledasm-pxa.S \ memsetup-s3c2500.S \ memsetup-sa1100.S \ memsetup-sa1110.S \ + memsetup-pxa.S \ start-s3c2500.S \ + start-sa11x0.S \ start-pxa.S \ - gpio-pxa.S \ - start-sa11x0.S + gpio-pxa.S blob_elf32_DEPENDENCIES = \ @BLOB_LED_STARTCODE@ \ |
|
From: Stefan E. <se...@us...> - 2003-11-10 17:06:45
|
Update of /cvsroot/blob/blob/src/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv27097/src/lib
Modified Files:
Makefile.am
Added Files:
led-pxa.c
Log Message:
pxa led breakout
--- NEW FILE: led-pxa.c ---
/*
* led-pxa.c: simple LED control functions
*
* Copyright (C) 1999 2001 Erik Mouw (J.A...@it...)
* Copyright (C) 1999 2003 stefan Eletzhofer <ste...@in...>
*
* $Id: led-pxa.c,v 1.1 2003/11/10 17:06:41 seletz Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
/*
* All functions assume that the LED is properly initialised by the code
* in ledasm-pxa.S.
*
*/
#ident "$Id: led-pxa.c,v 1.1 2003/11/10 17:06:41 seletz Exp $"
#ifdef HAVE_CONFIG_H
# include <blob/config.h>
#endif
#include <blob/main.h>
#include <blob/arch.h>
#include <blob/led.h>
#include <blob/init.h>
static int led_state;
static int led_locked;
static void pxa_led_on (void)
{
if (!led_locked) {
GPSR0 = LED_GPIO;
led_state = 1;
}
}
static void pxa_led_off (void)
{
if (!led_locked) {
GPCR0 = LED_GPIO;
led_state = 0;
}
}
static void pxa_led_toggle (void)
{
if (led_state)
pxa_led_off ();
else
pxa_led_on ();
}
static void pxa_led_lock (void)
{
led_locked = 1;
}
static void pxa_led_unlock (void)
{
led_locked = 0;
}
static led_driver_t pxa_gpio_led_driver = {
.led_on = pxa_led_on,
.led_off = pxa_led_off,
.led_toggle = pxa_led_toggle,
.led_lock = pxa_led_lock,
.led_unlock = pxa_led_unlock
};
Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am 4 Sep 2003 18:03:09 -0000 1.33
+++ Makefile.am 10 Nov 2003 17:06:41 -0000 1.34
@@ -57,6 +57,7 @@
led-mmap.c \
led-s3c2500.c \
led-sa11x0.c \
+ led-pxa.c \
reboot-pxa.c \
reboot-s3c2500.c \
reboot-sa11x0.c \
|
|
From: Stefan E. <se...@us...> - 2003-11-10 17:06:43
|
Update of /cvsroot/blob/blob In directory sc8-pr-cvs1:/tmp/cvs-serv27097 Modified Files: configure.in Log Message: pxa led breakout Index: configure.in =================================================================== RCS file: /cvsroot/blob/blob/configure.in,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- configure.in 5 Nov 2003 21:49:58 -0000 1.76 +++ configure.in 10 Nov 2003 17:06:40 -0000 1.77 @@ -205,9 +205,9 @@ board_name="Prueftechnik RotAlign Alpha" AC_DEFINE(RA_ALPHA,1,[PT RotAlign Alpha]) BLOB_PLATFORM_OBJS="ra_alpha.o" - dnl BLOB_LED_DRIVER_OBJS="led-sa11x0.o" dnl BLOB_NETWORK_DRIVER_OBJS="ether-smc9196.o" - dnl BLOB_LED_STARTCODE="ledasm-sa11x0.o" + BLOB_LED_DRIVER_OBJS="led-pxa.o" + BLOB_LED_STARTCODE="ledasm-pxa.o" BLOB_FLASH_OBJS="intel32.o" DIAG_PLATFORM_OBJS="ra_alpha.o" use_cpu="pxa250" |
|
From: Stefan E. <se...@us...> - 2003-11-10 13:17:31
|
Update of /cvsroot/blob/blob/src/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv11563
Modified Files:
download.c
Log Message:
fix confusing dl speed output. We only need the baud rate.
Index: download.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/download.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- download.c 4 Sep 2003 17:47:00 -0000 1.1
+++ download.c 10 Nov 2003 13:17:26 -0000 1.2
@@ -50,7 +50,7 @@
void PrintSerialSpeed(serial_baud_t speed)
{
if (speed >= baud_COUNT) printf("(unknown)");
- else printf("%d%i", speed, baud_rates[speed]);
+ else printf("%i", baud_rates[speed]);
}
|
|
From: Stefan E. <se...@us...> - 2003-11-05 21:50:02
|
Update of /cvsroot/blob/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv11556
Modified Files:
configure.in
Log Message:
Back out that change of the previous checkin. I need to investigate
_why_ I had it that way.
Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- configure.in 5 Nov 2003 10:11:32 -0000 1.75
+++ configure.in 5 Nov 2003 21:49:58 -0000 1.76
@@ -432,7 +432,7 @@
BLOB_MEMSETUP_OBJS="memsetup-s3c2500.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-s3c2500.o"
BLOB_SERIAL_DRIVER_OBJS="serial-s3c2500.o"
- BLOB_TIMER_DRIVER_OBJS="time-null.o time-s3c2500.o"
+ BLOB_TIMER_DRIVER_OBJS="time-s3c2500.o"
;;
sa1100)
dnl SA1100 CPU: EDORAM memory setup code
@@ -441,7 +441,7 @@
BLOB_MEMSETUP_OBJS="memsetup-sa1100.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-sa11x0.o"
BLOB_SERIAL_DRIVER_OBJS="serial-sa11x0.o"
- BLOB_TIMER_DRIVER_OBJS="time-null.o time-intelarm.o"
+ BLOB_TIMER_DRIVER_OBJS="time-intelarm.o"
;;
sa1110)
dnl SA1110 CPU: SDRAM memory setup code
@@ -450,7 +450,7 @@
BLOB_MEMSETUP_OBJS="memsetup-sa1110.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-sa11x0.o"
BLOB_SERIAL_DRIVER_OBJS="serial-sa11x0.o"
- BLOB_TIMER_DRIVER_OBJS="time-null.o time-intelarm.o"
+ BLOB_TIMER_DRIVER_OBJS="time-intelarm.o"
;;
pxa250)
dnl PXA250 CPU: SDRAM memory setup code
@@ -459,7 +459,7 @@
BLOB_MEMSETUP_OBJS="memsetup-pxa.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-pxa.o"
BLOB_SERIAL_DRIVER_OBJS="serial-pxa.o"
- BLOB_TIMER_DRIVER_OBJS="time-null.o time-intelarm.o"
+ BLOB_TIMER_DRIVER_OBJS="time-intelarm.o"
;;
*)
AC_MSG_ERROR([Unknown CPU name \"$use_cpu\", bailing out]);
|
|
From: Stefan E. <se...@us...> - 2003-11-05 10:11:40
|
Update of /cvsroot/blob/blob
In directory sc8-pr-cvs1:/tmp/cvs-serv10579
Modified Files:
configure.in
Log Message:
basic support of RotAlign Alpha, configure/automake stuff
Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- configure.in 4 Sep 2003 18:10:39 -0000 1.74
+++ configure.in 5 Nov 2003 10:11:32 -0000 1.75
@@ -201,6 +201,18 @@
use_cpu="sa1110"
use_lcd="yes"
;;
+ ra_alpha)
+ board_name="Prueftechnik RotAlign Alpha"
+ AC_DEFINE(RA_ALPHA,1,[PT RotAlign Alpha])
+ BLOB_PLATFORM_OBJS="ra_alpha.o"
+ dnl BLOB_LED_DRIVER_OBJS="led-sa11x0.o"
+ dnl BLOB_NETWORK_DRIVER_OBJS="ether-smc9196.o"
+ dnl BLOB_LED_STARTCODE="ledasm-sa11x0.o"
+ BLOB_FLASH_OBJS="intel32.o"
+ DIAG_PLATFORM_OBJS="ra_alpha.o"
+ use_cpu="pxa250"
+ use_lcd="no"
+ ;;
frodo)
board_name="2d3D, Inc. SA-1110 Development Board"
AC_DEFINE(FRODO,1,[2d3D, Inc. SA-1110 Development Board])
@@ -420,7 +432,7 @@
BLOB_MEMSETUP_OBJS="memsetup-s3c2500.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-s3c2500.o"
BLOB_SERIAL_DRIVER_OBJS="serial-s3c2500.o"
- BLOB_TIMER_DRIVER_OBJS="time-s3c2500.o"
+ BLOB_TIMER_DRIVER_OBJS="time-null.o time-s3c2500.o"
;;
sa1100)
dnl SA1100 CPU: EDORAM memory setup code
@@ -429,7 +441,7 @@
BLOB_MEMSETUP_OBJS="memsetup-sa1100.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-sa11x0.o"
BLOB_SERIAL_DRIVER_OBJS="serial-sa11x0.o"
- BLOB_TIMER_DRIVER_OBJS="time-intelarm.o"
+ BLOB_TIMER_DRIVER_OBJS="time-null.o time-intelarm.o"
;;
sa1110)
dnl SA1110 CPU: SDRAM memory setup code
@@ -438,7 +450,7 @@
BLOB_MEMSETUP_OBJS="memsetup-sa1110.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-sa11x0.o"
BLOB_SERIAL_DRIVER_OBJS="serial-sa11x0.o"
- BLOB_TIMER_DRIVER_OBJS="time-intelarm.o"
+ BLOB_TIMER_DRIVER_OBJS="time-null.o time-intelarm.o"
;;
pxa250)
dnl PXA250 CPU: SDRAM memory setup code
@@ -447,7 +459,7 @@
BLOB_MEMSETUP_OBJS="memsetup-pxa.o"
BLOB_REBOOT_DRIVER_OBJS="reboot-pxa.o"
BLOB_SERIAL_DRIVER_OBJS="serial-pxa.o"
- BLOB_TIMER_DRIVER_OBJS="time-intelarm.o"
+ BLOB_TIMER_DRIVER_OBJS="time-null.o time-intelarm.o"
;;
*)
AC_MSG_ERROR([Unknown CPU name \"$use_cpu\", bailing out]);
|
|
From: Stefan E. <se...@us...> - 2003-11-05 10:09:51
|
Update of /cvsroot/blob/blob/include/blob In directory sc8-pr-cvs1:/tmp/cvs-serv10102/include/blob Modified Files: arch.h Log Message: basic support for the RotAlign Alpha Base CPU Board Index: arch.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- arch.h 4 Sep 2003 18:10:40 -0000 1.18 +++ arch.h 5 Nov 2003 10:09:45 -0000 1.19 @@ -86,6 +86,8 @@ # include <blob/arch/pxa_idp.h> #elif defined CSIR_IMS # include <blob/arch/csir_ims.h> +#elif defined RA_ALPHA +# include <blob/arch/ra_alpha.h> #else # error "Please add an architecture specific include file" #endif |
704 messages has been excluded from this view by a project administrator.
