diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/s5l8702.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8702/debug-s5l8702.c | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/firmware/export/s5l8702.h b/firmware/export/s5l8702.h index b7da971b49..8e1d827f54 100644 --- a/firmware/export/s5l8702.h +++ b/firmware/export/s5l8702.h | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #define TIMER_FREQ 54000000 | 31 | #define TIMER_FREQ 54000000 |
32 | 32 | ||
33 | #define CACHEALIGN_BITS (4) /* 2^4 = 16 bytes */ | 33 | #define CACHEALIGN_BITS (5) /* 2^5 = 32 bytes */ |
34 | 34 | ||
35 | #define DRAM_ORIG 0x08000000 | 35 | #define DRAM_ORIG 0x08000000 |
36 | #define IRAM_ORIG 0 | 36 | #define IRAM_ORIG 0 |
diff --git a/firmware/target/arm/s5l8702/debug-s5l8702.c b/firmware/target/arm/s5l8702/debug-s5l8702.c index 27d1ccb7b8..66bfa36a93 100644 --- a/firmware/target/arm/s5l8702/debug-s5l8702.c +++ b/firmware/target/arm/s5l8702/debug-s5l8702.c | |||
@@ -61,6 +61,11 @@ bool dbg_hw_info(void) | |||
61 | _DEBUG_PRINTF("speed: %d MHz", ((CLKCON0 & 1) ? | 61 | _DEBUG_PRINTF("speed: %d MHz", ((CLKCON0 & 1) ? |
62 | CPUFREQ_NORMAL : CPUFREQ_MAX) / 1000000); | 62 | CPUFREQ_NORMAL : CPUFREQ_MAX) / 1000000); |
63 | _DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick); | 63 | _DEBUG_PRINTF("current_tick: %d", (unsigned int)current_tick); |
64 | uint32_t __res; | ||
65 | asm volatile ("mrc p15, 0, %0, c0, c0, 0" : "=r"(__res)); | ||
66 | _DEBUG_PRINTF("ID code: %08x", __res); | ||
67 | asm volatile ("mrc p15, 0, %0, c0, c0, 1" : "=r"(__res)); | ||
68 | _DEBUG_PRINTF("cache type: %08x", __res); | ||
64 | line++; | 69 | line++; |
65 | 70 | ||
66 | _DEBUG_PRINTF("LCD type: %d", lcd_type); | 71 | _DEBUG_PRINTF("LCD type: %d", lcd_type); |
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c index 38f9758c14..58060403d5 100755..100644 --- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | |||
@@ -48,8 +48,8 @@ | |||
48 | 48 | ||
49 | 49 | ||
50 | /** static, private data **/ | 50 | /** static, private data **/ |
51 | static uint8_t ceata_taskfile[16] __attribute__((aligned(16))); | 51 | static uint8_t ceata_taskfile[16] STORAGE_ALIGN_ATTR; |
52 | static uint16_t ata_identify_data[0x100] __attribute__((aligned(16))); | 52 | static uint16_t ata_identify_data[0x100] STORAGE_ALIGN_ATTR; |
53 | static bool ceata; | 53 | static bool ceata; |
54 | static bool ata_swap; | 54 | static bool ata_swap; |
55 | static bool ata_lba48; | 55 | static bool ata_lba48; |
@@ -68,7 +68,7 @@ static struct semaphore mmc_wakeup; | |||
68 | static struct semaphore mmc_comp_wakeup; | 68 | static struct semaphore mmc_comp_wakeup; |
69 | static int spinup_time = 0; | 69 | static int spinup_time = 0; |
70 | static int dma_mode = 0; | 70 | static int dma_mode = 0; |
71 | static char aligned_buffer[SECTOR_SIZE] __attribute__((aligned(0x10))); | 71 | static char aligned_buffer[SECTOR_SIZE] STORAGE_ALIGN_ATTR; |
72 | 72 | ||
73 | 73 | ||
74 | #ifdef ATA_HAVE_BBT | 74 | #ifdef ATA_HAVE_BBT |