Commit f78630ab2f4b15d493fa921bb43ddcec4119f6d3
1 parent
3b760e04
More phys_ram_base removal.
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7055 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
4 changed files
with
6 additions
and
6 deletions
hw/sharpsl.h
| @@ -18,6 +18,6 @@ void scoop_gpio_out_set(struct scoop_info_s *s, int line, | @@ -18,6 +18,6 @@ void scoop_gpio_out_set(struct scoop_info_s *s, int line, | ||
| 18 | qemu_irq handler); | 18 | qemu_irq handler); |
| 19 | 19 | ||
| 20 | #define SL_PXA_PARAM_BASE 0xa0000a00 | 20 | #define SL_PXA_PARAM_BASE 0xa0000a00 |
| 21 | -void sl_bootparam_write(uint32_t ptr); | 21 | +void sl_bootparam_write(target_phys_addr_t ptr); |
| 22 | 22 | ||
| 23 | #endif | 23 | #endif |
hw/spitz.c
| @@ -965,7 +965,7 @@ static void spitz_common_init(ram_addr_t ram_size, int vga_ram_size, | @@ -965,7 +965,7 @@ static void spitz_common_init(ram_addr_t ram_size, int vga_ram_size, | ||
| 965 | spitz_binfo.initrd_filename = initrd_filename; | 965 | spitz_binfo.initrd_filename = initrd_filename; |
| 966 | spitz_binfo.board_id = arm_id; | 966 | spitz_binfo.board_id = arm_id; |
| 967 | arm_load_kernel(cpu->env, &spitz_binfo); | 967 | arm_load_kernel(cpu->env, &spitz_binfo); |
| 968 | - sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE); | 968 | + sl_bootparam_write(SL_PXA_PARAM_BASE); |
| 969 | } | 969 | } |
| 970 | 970 | ||
| 971 | static void spitz_init(ram_addr_t ram_size, int vga_ram_size, | 971 | static void spitz_init(ram_addr_t ram_size, int vga_ram_size, |
hw/tosa.c
| @@ -239,7 +239,7 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size, | @@ -239,7 +239,7 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size, | ||
| 239 | tosa_binfo.initrd_filename = initrd_filename; | 239 | tosa_binfo.initrd_filename = initrd_filename; |
| 240 | tosa_binfo.board_id = 0x208; | 240 | tosa_binfo.board_id = 0x208; |
| 241 | arm_load_kernel(cpu->env, &tosa_binfo); | 241 | arm_load_kernel(cpu->env, &tosa_binfo); |
| 242 | - sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE); | 242 | + sl_bootparam_write(SL_PXA_PARAM_BASE); |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | QEMUMachine tosapda_machine = { | 245 | QEMUMachine tosapda_machine = { |
hw/zaurus.c
| @@ -275,8 +275,8 @@ static struct __attribute__ ((__packed__)) sl_param_info { | @@ -275,8 +275,8 @@ static struct __attribute__ ((__packed__)) sl_param_info { | ||
| 275 | .phadadj = 0x01, | 275 | .phadadj = 0x01, |
| 276 | }; | 276 | }; |
| 277 | 277 | ||
| 278 | -void sl_bootparam_write(uint32_t ptr) | 278 | +void sl_bootparam_write(target_phys_addr_t ptr) |
| 279 | { | 279 | { |
| 280 | - memcpy(phys_ram_base + ptr, &zaurus_bootparam, | ||
| 281 | - sizeof(struct sl_param_info)); | 280 | + cpu_physical_memory_write(ptr, (void *)&zaurus_bootparam, |
| 281 | + sizeof(struct sl_param_info)); | ||
| 282 | } | 282 | } |