diff -urN ecos/packages/devs/flash/h8300/aki3068net/current/src/aki3068net_flash.c ecos4mb/packages/devs/flash/h8300/aki3068net/current/src/aki3068net_flash.c --- ecos/packages/devs/flash/h8300/aki3068net/current/src/aki3068net_flash.c 2004-04-04 18:48:18.000000000 +0900 +++ ecos4mb/packages/devs/flash/h8300/aki3068net/current/src/aki3068net_flash.c 2007-04-13 14:37:50.151185600 +0900 @@ -103,11 +103,15 @@ #define REFRESH_MEM() refresh_all() static void refresh_all(void) { - volatile cyg_uint8 *p = (volatile cyg_uint8 *)0x400000; +// volatile cyg_uint8 *p = (volatile cyg_uint8 *)0x400000; + CYG_ADDRWORD page = 0; int i; for (i = 0; i < (1 << 21); i += (1 << 9)) { - *p; - p += (1 << 9); +// *p; +// p += (1 << 9); + *(volatile cyg_uint8 *)(0x400000 + page); + *(volatile cyg_uint8 *)(0x600000 + page); + page += (1 << 9); } } diff -urN ecos/packages/hal/h8300/aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl ecos4mb/packages/hal/h8300/aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl --- ecos/packages/hal/h8300/aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl 2007-02-09 16:09:09.932043200 +0900 +++ ecos4mb/packages/hal/h8300/aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl 2007-03-02 16:39:50.504469700 +0900 @@ -166,7 +166,7 @@ cdl_option CYGHWR_HAL_AKI3068NET_IDE { display "IDE I/F expand" flavor bool -## default_value 0 + #default_value 0 default_value 1 } @@ -320,7 +320,7 @@ cdl_option CYGDAT_REDBOOT_H8300_LINUX_COMMAND_START { display "Default kernel command line start address" flavor data - default_value 0x5ffe00 + default_value 0x7ffe00 description " This option uClinux kernel command line start address of default." } diff -urN ecos/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_ram.h ecos4mb/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_ram.h --- ecos/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_ram.h 2002-04-22 02:05:39.000000000 +0900 +++ ecos4mb/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_ram.h 2006-12-29 15:16:09.979000000 +0900 @@ -9,6 +9,7 @@ #endif #define CYGMEM_REGION_ram (0x420000) -#define CYGMEM_REGION_ram_SIZE (0x1E0000) +// #define CYGMEM_REGION_ram_SIZE (0x1E0000) +#define CYGMEM_REGION_ram_SIZE (0x3E0000) #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W) diff -urN ecos/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.h ecos4mb/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.h --- ecos/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.h 2004-04-04 18:38:14.000000000 +0900 +++ ecos4mb/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.h 2006-12-29 18:32:42.400875000 +0900 @@ -9,6 +9,7 @@ #endif #define CYGMEM_REGION_ram (0x400000) -#define CYGMEM_REGION_ram_SIZE (0x200000-0xC000) +/* #define CYGMEM_REGION_ram_SIZE (0x200000-0xC000) */ +#define CYGMEM_REGION_ram_SIZE (0x400000-0xC000) #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W) diff -urN ecos/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.ldi ecos4mb/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.ldi --- ecos/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.ldi 2004-04-11 22:40:28.000000000 +0900 +++ ecos4mb/packages/hal/h8300/aki3068net/current/include/pkgconf/mlt_h8300_h8300h_aki3068net_rom.ldi 2006-12-29 15:06:43.791500000 +0900 @@ -10,7 +10,8 @@ MEMORY { rom : ORIGIN = 0x000000, LENGTH = 0x60000 - ram : ORIGIN = 0x5f4000, LENGTH = 0xC000 +// ram : ORIGIN = 0x5f4000, LENGTH = 0xC000 + ram : ORIGIN = 0x7f4000, LENGTH = 0xC000 iram : ORIGIN = 0xffbf20, LENGTH = 0x4000 } @@ -27,7 +28,8 @@ SECTION_int_hook_table (rom, ALIGN (0x2), LMA_EQ_VMA) #endif SECTION_gcc_except_table (rom, ALIGN (0x1), LMA_EQ_VMA) - SECTION_data (ram, 0x5f4000, FOLLOWING (.gcc_except_table)) +// SECTION_data (ram, 0x5f4000, FOLLOWING (.gcc_except_table)) + SECTION_data (ram, 0x7f4000, FOLLOWING (.gcc_except_table)) SECTION_bss (ram, ALIGN (0x4), LMA_EQ_VMA) #if defined(CYGSEM_HAL_H8300_VECTOR_HOOK) SECTION_int_hook_table (iram, CYGHWR_HAL_H8300_VECTOR_ADDRESS, LMA_EQ_VMA) diff -urN ecos/packages/hal/h8300/aki3068net/current/include/platform.inc ecos4mb/packages/hal/h8300/aki3068net/current/include/platform.inc --- ecos/packages/hal/h8300/aki3068net/current/include/platform.inc 2004-03-03 01:50:08.000000000 +0900 +++ ecos4mb/packages/hal/h8300/aki3068net/current/include/platform.inc 2007-04-13 15:08:51.834764600 +0900 @@ -71,10 +71,14 @@ #else #define ABWCR_VAL 0xff #endif -#if (CYGINT_HAL_PLF_IF_IDE != 0) -#define CSCR_VAL ((1 << ((CYGHWR_HAL_IDE_REGISTER >> 21) & 7)) |\ - (1 << ((CYGHWR_HAL_IDE_ALT_REGS >> 21) & 7))) -#endif + +##if (CYGINT_HAL_PLF_IF_IDE != 0) +##define CSCR_VAL ((1 << ((CYGHWR_HAL_IDE_REGISTER >> 21) & 7)) |\ +## (1 << ((CYGHWR_HAL_IDE_ALT_REGS >> 21) & 7))) +##endif + +## for SBCR BOOK CHAPTER 7-1 +#define CSCR_VAL 0x30 #define CYGPKG_HAL_H8300_MEMC_DEFINED .macro hal_memc_init @@ -99,14 +103,15 @@ INIT_REGS_DATA(CYGARC_RTCOR,9) INIT_REGS_DATA(CYGARC_RTMCSR,0x30) INIT_REGS_DATA(CYGARC_DRCRB,0x98) -INIT_REGS_DATA(CYGARC_DRCRA,0x38) -INIT_REGS_DATA(CYGARC_ASTCR,0xfb) +##INIT_REGS_DATA(CYGARC_DRCRA,0x38) +INIT_REGS_DATA(CYGARC_DRCRA,0x58) +INIT_REGS_DATA(CYGARC_ASTCR,0xf3) INIT_REGS_DATA(CYGARC_ABWCR,ABWCR_VAL) #if defined(CSCR_VAL) INIT_REGS_DATA(CYGARC_CSCR,((CSCR_VAL) & 0xf0) | 0x0f) #endif INIT_REGS_DATA(CYGARC_WCRH ,0xff) -INIT_REGS_DATA(CYGARC_WCRL ,0xc8) +INIT_REGS_DATA(CYGARC_WCRL ,0x08) INIT_REGS_DATA(CYGARC_P1DDR,0xff) INIT_REGS_DATA(CYGARC_P2DDR,0xff) INIT_REGS_DATA(CYGARC_P5DDR,0x01)