diff options
author | Ian Chao <mlchao@nuvoton.com> | 2015-06-25 18:12:09 +0800 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-26 18:57:32 +0000 |
commit | 957638c78cc5aa0ba37ef281e2c6a09215c5d60e (patch) | |
tree | bc783f701e5b968449bfe3652e8cc20680620c8d /chip/npcx/config_chip.h | |
parent | ccb6b15d514b695b9ea472aa98d5f1730d58e244 (diff) | |
download | chrome-ec-957638c78cc5aa0ba37ef281e2c6a09215c5d60e.tar.gz |
nuc: Add SHI driver for arm-based platform in chip folder.
Add npcx_evb_arm board-level driver for arm-based platform.
Add header.c: for booting from NPCX5M5G A3 Booter.
Remove lfw folder due to those functionalitie have been replaced with Booter
Modified drivers for
Patch Set 1:
1. flash.c: Implement UMA lock, tri-state and selection register lock functionalities
2. hwtimer.c: Add ITIM32 for hwtimer
3. lpc.c: Add checking for LRESET
4. system.c: Modified CODERAM_ARCH functions for NPCX5M5G A3 Booter.
5. uart.c: Add support for module 2
Patch Set 2:
6. lpc.c: Modified lpc_get_pltrst_asserted() func
Patch Set 3:
7. minimize the changes for CONFIG_CODERAM_ARCH in common layer
8. comments of Patch Set1/2
Patch Set 4:
9. Modified CONFIG_RO_MEM_OFF point to ro image and keep header as a part of ec.RO.flat.
10. Fixed RO_FRID and RW_FRID issues which caused by CONFIG_CODERAM_ARCH.
Patch Set 5:
11. Modified system.c in common folder for supporting *_STORAGE_OFF.
12. Use *_STORAGE_OFF in firmware_image.lds.S to indicate flat file layout in flash.
Patch Set 6:
13. rebase to newest version
14. system.c: Modified for the newest include/system.h
Patch Set 7:
15. Merge from version 0625
BUG=chrome-os-partner:34346
TEST=make buildall -j; test nuvoton IC specific drivers
BRANCH=none
Change-Id: Ifd7c10b81b5781ccd75bb2558dc236486976e8ed
Signed-off-by: Ian Chao <mlchao@nuvoton.com>
Reviewed-on: https://chromium-review.googlesource.com/272034
Reviewed-by: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Commit-Queue: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'chip/npcx/config_chip.h')
-rw-r--r-- | chip/npcx/config_chip.h | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/chip/npcx/config_chip.h b/chip/npcx/config_chip.h index cd951e1f22..f7e1541250 100644 --- a/chip/npcx/config_chip.h +++ b/chip/npcx/config_chip.h @@ -35,9 +35,9 @@ /*****************************************************************************/ /* Memory mapping */ #define CONFIG_RAM_BASE 0x200C0000 /* memory map address of data ram */ -#define CONFIG_RAM_SIZE 0x00008000 /* 32KB data ram */ -#define CONFIG_CDRAM_BASE 0x10088000 /* memory map address of code ram */ -#define CONFIG_CDRAM_SIZE 0x00020000 /* 128KB code ram */ +#define CONFIG_RAM_SIZE (0x00008000 - 0x800) /* 30KB data ram */ +#define CONFIG_CDRAM_BASE 0x100A8000 /* memory map address of code ram */ +#define CONFIG_CDRAM_SIZE 0x00018000 /* 96KB code ram */ #define CONFIG_FLASH_BASE 0x64000000 /* memory address of spi-flash */ #define CONFIG_LPRAM_BASE 0x40001600 /* memory address of low power ram */ #define CONFIG_LPRAM_SIZE 0x00000620 /* 1568B low power ram */ @@ -61,38 +61,44 @@ #define CONFIG_FLASH_ERASE_SIZE 0x00001000 /* sector erase size 4K bytes */ #define CONFIG_FLASH_WRITE_SIZE 0x00000001 /* minimum write size */ -#define CONFIG_FLASH_WRITE_IDEAL_SIZE 256 /* one page size for write */ -#define CONFIG_FLASH_PHYSICAL_SIZE 0x00040000 /* 256KB Flash used for EC */ +#define CONFIG_FLASH_WRITE_IDEAL_SIZE 256 /* one page size for write */ +/* 128 KB alignment for SPI status registers protection */ +#define CONFIG_FLASH_PHYSICAL_SIZE 0x40000 /* 256 KB Flash used for EC */ /* No PSTATE; uses a real SPI flash */ #undef CONFIG_FLASH_PSTATE +/* Header support which is used by booter to copy FW from flash to code ram */ +#define NPCX_RO_HEADER + /****************************************************************************/ -/* Define our flash layout. */ +/* Define npcx flash layout. */ /* Size of one firmware image in flash */ #ifndef CONFIG_FW_IMAGE_SIZE #define CONFIG_FW_IMAGE_SIZE (CONFIG_FLASH_PHYSICAL_SIZE / 2) #endif -/* RO firmware offset of flash */ -#define CONFIG_RO_MEM_OFF 0 +/* The storage offset of ec.RO.flat which is used for CONFIG_CDRAM_ARCH */ #define CONFIG_RO_STORAGE_OFF 0 -#define CONFIG_RO_SIZE CONFIG_FW_IMAGE_SIZE +#ifdef NPCX_RO_HEADER +#define CONFIG_RO_HDR_MEM_OFF 0x0 +#define CONFIG_RO_HDR_SIZE 0x40 +/* RO firmware offset in flash */ +#define CONFIG_RO_MEM_OFF CONFIG_RO_HDR_SIZE +#else +#define CONFIG_RO_MEM_OFF 0x0 +#endif +#define CONFIG_RO_SIZE CONFIG_CDRAM_SIZE /* 96KB for RO FW */ #define CONFIG_FLASH_SIZE CONFIG_FLASH_PHYSICAL_SIZE -/* RW firmware is one firmware image offset from the start */ -#define CONFIG_RW_MEM_OFF CONFIG_FW_IMAGE_SIZE -#define CONFIG_RW_STORAGE_OFF CONFIG_FW_IMAGE_SIZE -#define CONFIG_RW_SIZE CONFIG_FW_IMAGE_SIZE +/* The storage offset of ec.RW.flat which is used for CONFIG_CDRAM_ARCH */ +#define CONFIG_RW_STORAGE_OFF CONFIG_FW_IMAGE_SIZE /* 128 KB alignemnt */ +/* RW firmware offset in flash */ +#define CONFIG_RW_MEM_OFF CONFIG_RW_STORAGE_OFF +#define CONFIG_RW_SIZE CONFIG_CDRAM_SIZE /* 96KB for RW FW */ #define CONFIG_WP_OFF CONFIG_RO_STORAGE_OFF -#define CONFIG_WP_SIZE CONFIG_RO_SIZE - -/* - * The offset from top of flash wich used by booter - * the main funcationality to copy iamge from spi-flash to code ram - */ -#define CONFIG_LFW_OFFSET 0x1000 +#define CONFIG_WP_SIZE CONFIG_FW_IMAGE_SIZE /****************************************************************************/ /* Customize the build */ @@ -101,11 +107,9 @@ #define CONFIG_ADC #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_LPC #define CONFIG_PECI #define CONFIG_SWITCH #define CONFIG_MPU -#define CONFIG_SPI /* Compile for running from RAM instead of flash */ /* #define COMPILE_FOR_RAM */ |