diff.txt

针对德州仪器DM270开发板的bootloader,其实现了内核的下载以及文件系统的下载

> }
> 
116,117c282,283
< 	unsigned char flag, key_val;
< 	volatile unsigned short port;
---
> 	unsigned char key_val;
>   unsigned char ch = 0;
120,127c286,296
< 		port = REG DIR0;	
< 	#if defined(PMP100_EVM)
< 		key_val = port & (1 << 6);
< 	#else
< 		key_val = port & (1 << 5);
< 	#endif
< 		if(!key_val)
< 			break;
---
> 		if(!read_irqPort()){
> 			key_val = detect_interrupt();
> 			util_printf("check  %x\n",key_val);
> 			if(key_val == ONKEY_DETECT){
> 				pmu_OnkeyCheck();
> 				break;
> 			}
> 		}	
> 
>       	ch = io_getc(100); // look for a key for x msec.
>       	if (ch > 0) break;
128a298,305
> }
> 
> void pmu_goStandBy(){
> 	unsigned char key_val,flag;
> 
> 	flag = pmu_read_reg(OOCC1,&key_val);
> 	key_val |= 0x01;
> 	pmu_write_reg(OOCC1,key_val); //go standBy 
Index: pmu.h
===================================================================
RCS file: /home/cvs/rrload/pmu.h,v
retrieving revision 1.1
diff -r1.1 pmu.h
4a5,66
> // Sub Addr of PCF50606
> #define ID		0x00
> #define OOCS	0x01
> #define INT1	0x02
> #define INT2	0x03
> #define INT3	0x04
> #define INT1M	0x05
> #define INT2M	0x06
> #define INT3M	0x07
> #define OOCC1	0x08
> #define OOCC2	0x09
> #define RTCSC	0x0A
> #define RTCMN	0x0B
> #define RTCHR	0x0C
> #define RTCWD	0x0D
> #define RTCDT	0x0E
> #define RTCMT	0x0F
> #define RTCYR	0x10
> #define RTCSCA	0x11
> #define RTCMNA	0x12
> #define RTCHRA	0x13
> #define RTCWDA	0x14
> #define RTCDTA	0x15
> #define RTCMTA	0x16
> #define RTCTRA	0x17
> #define PSSC	0x18
> #define PWROKM	0x19
> #define PWROKS	0x1A
> #define DCDC1	0x1B
> #define DCDC2	0x1C
> #define DCDC3	0x1D
> #define DCDC4	0x1E
> #define DCDEC1	0x1F
> #define DCDEC2	0x20
> #define DCUDC1	0x21
> #define DCUDC2	0x22
> #define IOREGC	0x23
> #define D1REGC1	0x24
> #define D2REGC1	0x25
> #define D3REGC1	0x26
> #define LPREGC1	0x27
> #define LPREGC2	0x28
> #define MBCC1	0x29
> #define MBCC2	0x2A
> #define MBCC3	0x2B
> #define MBCS1	0x2C
> #define BBCC	0x2D
> #define ADCC1	0x2E
> #define ADCC2	0x2F
> #define ADCS1	0x30
> #define ADCS2	0x31
> #define ADCS3	0x32
> #define ACDC1	0x33
> #define BVMC	0x34
> #define PWMC1	0x35
> #define LEDC1	0x36
> #define LEDC2	0x37
> #define GPOC1	0x38
> #define GPOC2	0x39
> #define GPOC3	0x3A
> #define GPOC4	0x3B
> #define GPOC5	0x3C	
6c68,72
< 
---
> enum {ONKEY_DETECT= 1,ONKEY1S_DETECT,EXTONF_DETECT,ALARM_DETECT,//INT1 REG.
> 	CHGINS_DETECT,CHGRM_DETECT,								//INT2 REG
> 	ADCREADY_DETECT,									};	//INT3 REG
> 		
> 		
7a74,75
> unsigned char pmu_write_reg(unsigned char subaddr, unsigned char data);
> unsigned char pmu_read_reg(unsigned char subaddr, unsigned char *value);
8a77,81
> unsigned char pmu_OnkeyCheck(void);
> unsigned char detect_interrupt(void);
> unsigned char read_irqPort(void);
> void waitOnKey(void);
> void pmu_goStandBy();
Index: rrload
===================================================================
RCS file: /home/cvs/rrload/rrload,v
retrieving revision 1.2
diff -r1.2 rrload
Binary files /tmp/cvslM9G55 and rrload differ
Index: rrload.ForUpgrade
===================================================================
RCS file: /home/cvs/rrload/rrload.ForUpgrade,v
retrieving revision 1.2
diff -r1.2 rrload.ForUpgrade
Binary files /tmp/cvsvXVGIe and rrload.ForUpgrade differ
Index: rrload.ForUpgrade.stripped
===================================================================
RCS file: /home/cvs/rrload/rrload.ForUpgrade.stripped,v
retrieving revision 1.4
diff -r1.4 rrload.ForUpgrade.stripped
Binary files /tmp/cvs1L1inn and rrload.ForUpgrade.stripped differ
Index: rrload.map
===================================================================
RCS file: /home/cvs/rrload/rrload.map,v
retrieving revision 1.2
diff -r1.2 rrload.map
61,232c61,222
< 021035e0 t print_rows
< 021036b4 t print_cs8900_memory
< 02103768 t print_memory_map
< 021039d0 t dump_memory
< 02103c28 t menu_mode
< 02103fb0 t process_default_boot_cmd
< 0210408c T main
< 02104590 T btldr_init
< 02104b7c T btldr_AddressIsInFlashSpace
< 02104bd8 T get_flash_comp_addresses
< 02104cd0 T get_sdram_comp_addresses
< 02104db8 t put_val_at_addr
< 02104e7c t get_val_from_addr
< 02104f04 t load
< 02105368 t dma_flash_read
< 021053fc t loop
< 02105494 t pull_from_flash
< 0210578c t flash_area_has_content
< 02105830 t push_to_flash
< 02105e70 T cmd_copy_comp
< 02106010 T cmd_get_params
< 0210602c T cmd_boot_kernel
< 021061a8 T erase_comp
< 0210624c T lock_flash
< 0210626c T unlock_flash
< 02106294 t ReadByte
< 021062ec t GetByteValFromCharPair
< 02106358 T srec_RegisterGetByte
< 02106380 T srec_RegisterPut
< 021063a8 T srec_parse
< 02106988 t ReadByte
< 021069e0 t GetByteValFromCharPair
< 02106a4c t GetIntValFromCharQuadPair
< 02106ae0 T rawbin_RegisterGetByte
< 02106b08 T rawbin_RegisterPut
< 02106b30 T rawbin_parse
< 02106ee4 T util_ascii_to_bin
< 02106f1c T util_hexstrtoint
< 0210706c T util_hexstrtobyte
< 0210719c T util_decstrtoint
< 02107290 T util_decstrtobyte
< 02107454 T util_IPstr_to_num
< 02107680 T util_fill_MAC
< 021077d8 t do_printf
< 02107d48 t do_sprintf
< 02107d84 T util_putchar
< 02107db4 T util_printf
< 02107e2c T util_strchr
< 02107e94 T util_strlen
< 02107ef8 T util_strncmp
< 02107ffc T util_strcmp
< 021080b4 T util_strcpy
< 0210815c T util_strncpy
< 021081f4 T util_getchar
< 02108218 T util_gets
< 02108350 T util_strip_CRLF
< 021083c4 T util_dump_memory
< 02108490 t build_tftp_datagram
< 021085fc T connect_tftp
< 02108690 T disconnect_tftp
< 02108728 t get_block_buff
< 0210896c T get_next_tftp_block
< 02108b84 T getchar_tftp
< 02108c2c T tftp_init
< 02108cf8 t ip_chksum
< 02108e1c t ip_submit
< 021093d8 T udp_submit
< 02109818 T net_init
< 02109828 T GIODirSet
< 0210990c T GIOSet
< 021099bc T GIOGet
< 02109a6c T set_PMU_SCL_High
< 02109a88 T set_PMU_SCL_Low
< 02109aa4 T set_PMU_SDA_High
< 02109ac0 T set_PMU_SDA_Low
< 02109adc T make_PMU_SDA_Input
< 02109b08 T make_PMU_SDA_Output
< 02109b3c T get_SDA
< 02109ba8 T get_Ack
< 02109c00 T send_Ack
< 02109c1c T send_Nack
< 02109c38 T i2c_wait
< 02109c80 T i2c_Init
< 02109cbc T i2c_Open
< 02109cd8 T i2c_Stop
< 02109cf8 T i2c_Send_Byte
< 02109d80 T i2c_Read_Byte
< 02109e08 T i2c_writeReg
< 02109ee0 T i2c_readReg
< 02109fec T pmu_BootInit
< 0210a190 T pmu_OnkeyCheck
< 0210a1b0 t writereg
< 0210a20c T readreg_silent
< 0210a254 T readreg
< 0210a300 t chip_online
< 0210a378 t chip_reset
< 0210a3f8 t chip_mac_assign
< 0210a4e4 t chip_read_data_polled
< 0210a654 t chip_send_data
< 0210a904 T ether_init
< 0210a914 T ether_submit
< 0210aa04 t outw
< 0210aa3c t inw
< 0210aa74 t insw
< 0210aac8 t outsw
< 0210ab1c T get_start_address
< 0210abd0 T get_end_address
< 0210ac8c t verify_block_erased
< 0210ad88 t enable_read_mode
< 0210ae48 t cfi_supported
< 0210afe8 T read_device_codes
< 0210b1fc T read_cfi_array
< 0210b364 T build_sector_map
< 0210b8d4 t block_erase
< 0210baf8 t prog_data
< 0210bd00 T flash_read
< 0210bdcc T flash_write
< 0210bec8 T flash_flush
< 0210bee0 T flash_erase
< 0210bfd0 T flash_erase_range
< 0210c16c T flash_init
< 0210c348 t inreg_ser
< 0210c384 t outreg_ser
< 0210c3bc t uart_init
< 0210c3cc t is_ser_char
< 0210c410 t io_putchar_ser
< 0210c47c T io_getchar_ser
< 0210c4e0 t is_char
< 0210c538 T io_getc
< 0210c5bc T io_getchar_con
< 0210c61c T io_putchar
< 0210c67c t is_par_char
< 0210c694 t io_putchar_par
< 0210c6c8 T io_getchar_par
< 0210c6fc T io_getbootmode
< 0210c714 T display_board_digit
< 0210c734 T io_delay
< 0210c7a8 T io_StartTimeElapse
< 0210c7c0 T io_TimeElapseHasExpired
< 0210c7d8 T io_AddressIsInFlashSpace
< 0210c804 t flash__init
< 0210c814 t misc_init
< 0210c824 T io_init
< 0210c850 T io_change_con
< 0210c8a4 T osd_init
< 0210c8bc T osd_display
< 0210c8d4 T osd_init_mem
< 0210c8fc T osd_load_logo
< 0210c924 T cache_init
< 0210c938 T icache_enable
< 0210c970 T icache_clear
< 0210c9dc T icache_disable
< 0210ca0c t show_usage
< 0210ca40 t skip_spaces
< 0210ca94 t parse_decimal
< 0210cb4c t parse_hex
< 0210cd00 t parse_line
< 0210d004 t do_command
< 0210d3e0 T modify_memory
< 0210d490 t inw
< 0210d4c0 t outw
< 0210ed8c t hextable
< 0210eeec t hex
< 0210f1f8 t M29W320DB_SECT_SIZES
< 0210f338 t SST39VF320_SECT_SIZES
< 0210fa20 A __RONLY_end
< 0210fa20 T __start___ex_table
< 0210fa20 T __start___ksymtab
< 0210fa20 T __stop___ex_table
< 0210fa20 T __stop___ksymtab
< 0210fa20 T _etext
< 0210fa20 T etext
---
> 021035e0 t print_memory_map
> 02103848 t dump_memory
> 02103aa0 t menu_mode
> 02103e10 t process_default_boot_cmd
> 02103f04 T main
> 02104408 T btldr_init
> 021049e4 T btldr_AddressIsInFlashSpace
> 02104a40 T get_flash_comp_addresses
> 02104b38 T get_sdram_comp_addresses
> 02104c20 t put_val_at_addr
> 02104ce4 t get_val_from_addr
> 02104d6c t load
> 021051d0 t dma_flash_read
> 02105264 t loop
> 021052fc t pull_from_flash
> 021055f4 t flash_area_has_content
> 02105698 t push_to_flash
> 02105cd8 T cmd_copy_comp
> 02105e78 T cmd_get_params
> 02105e94 T cmd_boot_kernel
> 02106010 T erase_comp
> 021060b4 T lock_flash
> 021060d4 T unlock_flash
> 021060fc t ReadByte
> 02106154 t GetByteValFromCharPair
> 021061c0 T srec_RegisterGetByte
> 021061e8 T srec_RegisterPut
> 02106210 T srec_parse
> 021067f0 t ReadByte
> 02106848 t GetByteValFromCharPair
> 021068b4 t GetIntValFromCharQuadPair
> 02106948 T rawbin_RegisterGetByte
> 02106970 T rawbin_RegisterPut
> 02106998 T rawbin_parse
> 02106d4c T util_ascii_to_bin
> 02106d84 T util_hexstrtoint
> 02106ed4 T util_hexstrtobyte
> 02107004 T util_decstrtoint
> 021070f8 T util_decstrtobyte
> 021072bc T util_IPstr_to_num
> 021074e8 T util_fill_MAC
> 02107640 t do_printf
> 02107bb0 t do_sprintf
> 02107bec T util_putchar
> 02107c1c T util_printf
> 02107c94 T util_strchr
> 02107cfc T util_strlen
> 02107d60 T util_strncmp
> 02107e64 T util_strcmp
> 02107f1c T util_strcpy
> 02107fc4 T util_strncpy
> 0210805c T util_getchar
> 02108080 T util_gets
> 021081b8 T util_strip_CRLF
> 0210822c t build_tftp_datagram
> 02108398 T connect_tftp
> 0210842c T disconnect_tftp
> 021084c4 t get_block_buff
> 02108708 T get_next_tftp_block
> 02108920 T getchar_tftp
> 021089c8 T tftp_init
> 02108a94 t ip_chksum
> 02108bb8 t ip_submit
> 02109138 T udp_submit
> 02109578 T net_init
> 02109588 T I2C_init
> 02109828 T I2C_writeReg
> 02109900 T I2C_writeRegs
> 02109a14 T I2C_readReg
> 02109b1c T I2C_readRegs
> 02109c48 t makeSclLow
> 02109c74 t makeSclHigh
> 02109ca0 t makeSdaLow
> 02109ccc t makeSdaHigh
> 02109cf8 t readSda
> 02109d58 t makeSdaInput
> 02109d94 t makeSdaOutput
> 02109dd8 t i2cStart
> 02109e04 t i2cStop
> 02109e28 t i2cReadBit
> 02109e78 t i2cWriteBit
> 02109ebc t i2cGetAck
> 02109f0c t i2cSendNack
> 02109f24 t i2cSendAck
> 02109f3c t i2cReadByte
> 02109fdc t i2cWriteByte
> 0210a074 t i2cWait
> 0210a0b4 T pmu_write_reg
> 0210a104 T pmu_read_reg
> 0210a154 T pmu_BootInit
> 0210a4d0 T read_irqPort
> 0210a534 T pmu_OnkeyCheck
> 0210a5f8 T detect_interrupt
> 0210a7bc T waitOnKey
> 0210a854 T pmu_goStandBy
> 0210a8a4 T get_start_address
> 0210a958 T get_end_address
> 0210aa14 t verify_block_erased
> 0210ab10 t enable_read_mode
> 0210abd0 t cfi_supported
> 0210ad70 T read_device_codes
> 0210af84 T read_cfi_array
> 0210b0ec T build_sector_map
> 0210b65c t block_erase
> 0210b880 t prog_data
> 0210ba88 T flash_read
> 0210bb54 T flash_write
> 0210bc50 T flash_flush
> 0210bc68 T flash_erase
> 0210bd58 T flash_erase_range
> 0210bef4 T flash_init
> 0210c0d0 t inreg_ser
> 0210c10c t outreg_ser
> 0210c144 t uart_init
> 0210c154 t is_ser_char
> 0210c198 t io_putchar_ser
> 0210c204 T io_getchar_ser
> 0210c268 t is_char
> 0210c2c0 T io_getc
> 0210c344 T io_getchar_con
> 0210c3a4 T io_putchar
> 0210c404 t is_par_char
> 0210c41c t io_putchar_par
> 0210c450 T io_getchar_par
> 0210c484 T io_getbootmode
> 0210c49c T display_board_digit
> 0210c4bc T io_delay
> 0210c530 T io_StartTimeElapse
> 0210c548 T io_TimeElapseHasExpired
> 0210c560 T io_AddressIsInFlashSpace
> 0210c58c t flash__init
> 0210c59c t misc_init
> 0210c5ac T io_init
> 0210c5d8 T io_change_con
> 0210c62c T osd_init
> 0210c644 T osd_display
> 0210c65c T osd_init_mem
> 0210c684 T osd_load_logo
> 0210c6ac T cache_init
> 0210c6c0 T icache_enable
> 0210c6f8 T icache_clear
> 0210c764 T icache_disable
> 0210c794 t show_usage
> 0210c7c8 t skip_spaces
> 0210c81c t parse_decimal
> 0210c8d4 t parse_hex
> 0210ca88 t parse_line
> 0210cd8c t do_command
> 0210d168 T modify_memory
> 0210d218 t inw
> 0210d248 t outw
> 0210eabc t hextable
> 0210ec1c t hex
> 0210ef98 t M29W320DB_SECT_SIZES
> 0210f0d8 t SST39VF320_SECT_SIZES
> 0210f7c0 A __RONLY_end
> 0210f7c0 T __start___ex_table
> 0210f7c0 T __start___ksymtab
> 0210f7c0 T __stop___ex_table
> 0210f7c0 T __stop___ksymtab
> 0210f7c0 T _etext
> 0210f7c0 T etext
266,285c256,281
< 02110d84 b last_readreg_addr
< 02110d86 b last_readreg_data
< 02110d88 b VENDOR_ID
< 02110d8c b FLASH_ID
< 02110d90 b NUM_CHIP_SECT
< 02110d94 b TOTAL_SECT
< 02110d98 b CONSOLE_TYPE
< 02110d9c b line
< 02110e1c b cmd_code
< 02110e20 b cmd_address
< 02110e24 b cmd_value
< 02110e28 b cmd_write
< 02110e2c b cmd_count
< 02110e30 B __bss_end
< 02110e30 B cmd
< 02110e3c B FlashLockMode
< 02110e40 B free_memory_start
< 02110e44 B free_memory_size
< 02110e48 B Start_Of_Session
< 02110e50 B sect_info
---
> 02110d84 b i2c_scl
> 02110d86 b i2c_sda
> 02110d88 b dir_scl
> 02110d8c b bitset_scl
> 02110d90 b bitclr_scl
> 02110d94 b dir_sda
> 02110d98 b bitset_sda
> 02110d9c b bitclr_sda
> 02110da0 b VENDOR_ID
> 02110da4 b FLASH_ID
> 02110da8 b NUM_CHIP_SECT
> 02110dac b TOTAL_SECT
> 02110db0 b CONSOLE_TYPE
> 02110db4 b line
> 02110e34 b cmd_code
> 02110e38 b cmd_address
> 02110e3c b cmd_value
> 02110e40 b cmd_write
> 02110e44 b cmd_count
> 02110e48 B __bss_end
> 02110e50 B cmd
> 02110e5c B FlashLockMode
> 02110e60 B free_memory_start
> 02110e64 B free_memory_size
> 02110e68 B Start_Of_Session
> 02110e70 B sect_info
288c284
< 02112e30 B __stack_start
---
> 02112e48 B __stack_start
Index: rrload.out
===================================================================
RCS file: /home/cvs/rrload/rrload.out,v
retrieving revision 1.2
diff -r1.2 rrload.out
Binary files /tmp/cvsbbu0KE and rrload.out differ
Index: rrload.stripped
===================================================================
RCS file: /home/cvs/rrload/rrload.stripped,v
retrieving revision 1.4
diff -r1.4 rrload.stripped
Binary files /tmp/cvstEJcuN and rrload.stripped differ
Index: setup
===================================================================
RCS file: /home/cvs/rrload/setup,v
retrieving revision 1.2
diff -r1.2 setup
Binary files /tmp/cvsvLY1dW and setup differ
Index: version.h
===================================================================
RCS file: /home/cvs/rrload/version.h,v
retrieving revision 1.3
diff -r1.3 version.h
8a9,10
> #include "pmpConfig.h"
> 
10c12
< #define RRLOAD_VERSION   "5.34-2.3-afraxus-pmu"
---
> #define RRLOAD_VERSION   "5.34-2.6-afraxus-pmu"
12c14
< #define RRLOAD_VERSION   "5.34-2.3-afraxus"
---
> #define RRLOAD_VERSION   "5.34-2.6-afraxus"