diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-02-19 06:34:53 +0800 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-02-19 10:49:08 +1100 |
| commit | 348d5c4875ec46792d1749a88ec7457c62650e08 (patch) | |
| tree | 9daa0bc9004320f8b3ab2e152f89d271ed3e1a62 /include | |
| parent | 73b262e768529f152ec64b4418b0c31691bc15c3 (diff) | |
| download | skiboot-348d5c4875ec46792d1749a88ec7457c62650e08.zip skiboot-348d5c4875ec46792d1749a88ec7457c62650e08.tar.gz skiboot-348d5c4875ec46792d1749a88ec7457c62650e08.tar.bz2 | |
core/flash: Move flash NVRAM handling to new flash module
Since we want to prevent conflicts between PNOR and NVRAM, this change
moves the flash-nvram handling out of flash-nvram.c and into the generic
flash module. This way, the OPAL_FLASH_{READ,WRITE,ERASE} API won't
conflict with the OPAL_*_NVRAM api.
To do this, we use the flash_register function to look for an "NVRAM"
partition. If one is found, it is automatically registered as the system
NVRAM backend.
We also change the rhesus and astmbc platforms to use the common flash
code.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/skiboot.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/skiboot.h b/include/skiboot.h index f6fcc63..a13b438 100644 --- a/include/skiboot.h +++ b/include/skiboot.h @@ -206,9 +206,6 @@ extern bool flash_load_resource(enum resource_id id, uint32_t subid, extern void nvram_init(void); extern void nvram_read_complete(bool success); -/* NVRAM on flash helper */ -extern int flash_nvram_init(struct flash_chip *chip, uint32_t start, - uint32_t size); /* UART stuff */ extern void uart_irq(void); extern void uart_setup_linux_passthrough(void); |