diff options
Diffstat (limited to 'firmware/target/arm/s5l8700')
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | 11 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c index 9cb350d004..65a282fe37 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nand-target.h> | 26 | #include <nand-target.h> |
27 | #include <ftl-target.h> | 27 | #include <ftl-target.h> |
28 | #include <string.h> | 28 | #include <string.h> |
29 | #include "system.h" | ||
29 | #include "kernel.h" | 30 | #include "kernel.h" |
30 | #include "panic.h" | 31 | #include "panic.h" |
31 | 32 | ||
@@ -371,10 +372,10 @@ struct ftl_vfl_cxt_type ftl_vfl_cxt[4]; | |||
371 | struct ftl_cxt_type ftl_cxt; | 372 | struct ftl_cxt_type ftl_cxt; |
372 | 373 | ||
373 | /* Temporary data buffers for internal use by the FTL */ | 374 | /* Temporary data buffers for internal use by the FTL */ |
374 | uint8_t ftl_buffer[0x800] __attribute__((aligned(16))); | 375 | uint8_t ftl_buffer[0x800] STORAGE_ALIGN_ATTR; |
375 | 376 | ||
376 | /* Temporary spare byte buffer for internal use by the FTL */ | 377 | /* Temporary spare byte buffer for internal use by the FTL */ |
377 | union ftl_spare_data_type ftl_sparebuffer[FTL_WRITESPARE_SIZE] __attribute__((aligned(16))); | 378 | union ftl_spare_data_type ftl_sparebuffer[FTL_WRITESPARE_SIZE] STORAGE_ALIGN_ATTR; |
378 | 379 | ||
379 | 380 | ||
380 | #ifndef FTL_READONLY | 381 | #ifndef FTL_READONLY |
@@ -404,12 +405,12 @@ uint8_t ftl_erasectr_dirt[8]; | |||
404 | /* Buffer needed for copying pages around while moving or committing blocks. | 405 | /* Buffer needed for copying pages around while moving or committing blocks. |
405 | This can't be shared with ftl_buffer, because this one could be overwritten | 406 | This can't be shared with ftl_buffer, because this one could be overwritten |
406 | during the copying operation in order to e.g. commit a CXT. */ | 407 | during the copying operation in order to e.g. commit a CXT. */ |
407 | uint8_t ftl_copybuffer[FTL_COPYBUF_SIZE][0x800] __attribute__((aligned(16))); | 408 | uint8_t ftl_copybuffer[FTL_COPYBUF_SIZE][0x800] STORAGE_ALIGN_ATTR; |
408 | union ftl_spare_data_type ftl_copyspare[FTL_COPYBUF_SIZE] __attribute__((aligned(16))); | 409 | union ftl_spare_data_type ftl_copyspare[FTL_COPYBUF_SIZE] STORAGE_ALIGN_ATTR; |
409 | 410 | ||
410 | /* Needed to store the old scattered page offsets in order to be able to roll | 411 | /* Needed to store the old scattered page offsets in order to be able to roll |
411 | back if something fails while compacting a scattered page block. */ | 412 | back if something fails while compacting a scattered page block. */ |
412 | uint16_t ftl_offsets_backup[0x200] __attribute__((aligned(16))); | 413 | uint16_t ftl_offsets_backup[0x200] STORAGE_ALIGN_ATTR; |
413 | 414 | ||
414 | #endif | 415 | #endif |
415 | 416 | ||
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c index 189dc4cafb..b7e1f8494b 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | |||
@@ -99,10 +99,10 @@ static struct wakeup nand_wakeup; | |||
99 | static struct mutex ecc_mtx; | 99 | static struct mutex ecc_mtx; |
100 | static struct wakeup ecc_wakeup; | 100 | static struct wakeup ecc_wakeup; |
101 | 101 | ||
102 | static uint8_t nand_data[0x800] __attribute__((aligned(16))); | 102 | static uint8_t nand_data[0x800] STORAGE_ALIGN_ATTR; |
103 | static uint8_t nand_ctrl[0x200] __attribute__((aligned(16))); | 103 | static uint8_t nand_ctrl[0x200] STORAGE_ALIGN_ATTR; |
104 | static uint8_t nand_spare[0x40] __attribute__((aligned(16))); | 104 | static uint8_t nand_spare[0x40] STORAGE_ALIGN_ATTR; |
105 | static uint8_t nand_ecc[0x30] __attribute__((aligned(16))); | 105 | static uint8_t nand_ecc[0x30] STORAGE_ALIGN_ATTR; |
106 | 106 | ||
107 | 107 | ||
108 | uint32_t nand_unlock(uint32_t rc) | 108 | uint32_t nand_unlock(uint32_t rc) |