From: Heesub Shin Date: Tue, 14 Mar 2017 10:33:52 +0000 (+0900) Subject: s5j: sidk_s5jt200: convert kbytes unit to bytes X-Git-Tag: 1.1_Public_Release~614^2~313 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fed30c8b01dfbe93d8816c9f1b1805ef5f10335;p=rtos%2Ftinyara.git s5j: sidk_s5jt200: convert kbytes unit to bytes It is very confusing to mix up numerical units on configurations. We need consistency on numerical values. This commit changes all KByte-unit numbers to Bytes. Change-Id: Icfbeb11ea5f616864be86b78f14f5ba8ba86f32a Signed-off-by: Heesub Shin --- diff --git a/build/configs/sidk_s5jt200/hello_with_tash/defconfig b/build/configs/sidk_s5jt200/hello_with_tash/defconfig index 0ffdcfe..41e1535 100644 --- a/build/configs/sidk_s5jt200/hello_with_tash/defconfig +++ b/build/configs/sidk_s5jt200/hello_with_tash/defconfig @@ -206,9 +206,9 @@ CONFIG_S5J_SFLASH=y # Serial FLASH region # CONFIG_S5J_FLASH_BASE=0x04000000 -CONFIG_S5J_FLASH_SIZE=8192 +CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 -CONFIG_S5J_BOOTLOADER_REGION_SIZE=4096 +CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 CONFIG_NVRAM_WIFI_START=0x043BE000 # diff --git a/build/configs/sidk_s5jt200/kernel_sample/defconfig b/build/configs/sidk_s5jt200/kernel_sample/defconfig index 7a505c6..02f16c7 100644 --- a/build/configs/sidk_s5jt200/kernel_sample/defconfig +++ b/build/configs/sidk_s5jt200/kernel_sample/defconfig @@ -206,9 +206,9 @@ CONFIG_S5J_SFLASH=y # Serial FLASH region # CONFIG_S5J_FLASH_BASE=0x04000000 -CONFIG_S5J_FLASH_SIZE=8192 +CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 -CONFIG_S5J_BOOTLOADER_REGION_SIZE=4096 +CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 CONFIG_NVRAM_WIFI_START=0x043BE000 # diff --git a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig index 85dd1f5..10198a0 100755 --- a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig +++ b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig @@ -209,9 +209,9 @@ CONFIG_S5J_SFLASH=y # Serial FLASH region # CONFIG_S5J_FLASH_BASE=0x04000000 -CONFIG_S5J_FLASH_SIZE=8192 +CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 -CONFIG_S5J_BOOTLOADER_REGION_SIZE=4096 +CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 CONFIG_NVRAM_WIFI_START=0x04602000 # diff --git a/build/configs/sidk_s5jt200/tc/defconfig b/build/configs/sidk_s5jt200/tc/defconfig index 14671aa..ee52198 100644 --- a/build/configs/sidk_s5jt200/tc/defconfig +++ b/build/configs/sidk_s5jt200/tc/defconfig @@ -205,9 +205,9 @@ CONFIG_S5J_SFLASH=y # Serial FLASH region # CONFIG_S5J_FLASH_BASE=0x04000000 -CONFIG_S5J_FLASH_SIZE=8192 +CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 -CONFIG_S5J_BOOTLOADER_REGION_SIZE=4096 +CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 CONFIG_NVRAM_WIFI_START=0x043BE000 # diff --git a/os/arch/arm/src/s5j/s5j_boot.c b/os/arch/arm/src/s5j/s5j_boot.c index 0d38a4e..f84af62 100644 --- a/os/arch/arm/src/s5j/s5j_boot.c +++ b/os/arch/arm/src/s5j/s5j_boot.c @@ -132,7 +132,7 @@ int s5j_mpu_initialize(void) * BL1 + TinyAra OS + SSS F/W, wifi F/W, CM0 F/W */ base = CONFIG_S5J_FLASH_BASE; - size = CONFIG_S5J_BOOTLOADER_REGION_SIZE * 1024; /* 4096*1024 */ + size = CONFIG_S5J_BOOTLOADER_REGION_SIZE; mpu_priv_flash(base, size); /* Region 5, for wifi dedicated area, RW-WBWA, 0x043C_0000 -- 8KB */ @@ -143,8 +143,8 @@ int s5j_mpu_initialize(void) * Region 6, FILE SYSTEM : 0x0440_0000 ++ 4MB - 256KB * filesystem - smartfs */ - base = CONFIG_S5J_FLASH_BASE + CONFIG_S5J_BOOTLOADER_REGION_SIZE * 1024; - size = (CONFIG_S5J_FLASH_SIZE - CONFIG_S5J_BOOTLOADER_REGION_SIZE) * 1024; + base = CONFIG_S5J_FLASH_BASE + CONFIG_S5J_BOOTLOADER_REGION_SIZE; + size = CONFIG_S5J_FLASH_SIZE - CONFIG_S5J_BOOTLOADER_REGION_SIZE; mpu_user_intsram_wb(base, size); #endif @@ -152,12 +152,12 @@ int s5j_mpu_initialize(void) * Region 7, SSS F/W region2 : 0x047C_0000 ++ 256KB * SSS key area RW, priority higher than 0x0400_0000, 4MB attribute(WBWA, RO) */ - base = CONFIG_S5J_FLASH_BASE + (CONFIG_S5J_FLASH_SIZE) * 1024; + base = CONFIG_S5J_FLASH_BASE + CONFIG_S5J_FLASH_SIZE; size = 256 * 1024; mpu_user_intsram_wb(base, size); /* region 8, for Sflash Mirror(0x6000_0000, RO) */ - mpu_priv_flash(0x60000000, CONFIG_S5J_FLASH_SIZE * 1024); + mpu_priv_flash(0x60000000, CONFIG_S5J_FLASH_SIZE); /* Region 9, for vecotr table(0x8000_0000, RW-STRONG-ORDER */ mpu_priv_stronglyordered(0x80000000, 0x10000000);