使用QEMU建立Mini2440的模拟环境(3)

127. - } 128. -#endif 129. - /* 130. - * if a u--boot is available as a file, we always use it 131. - */ 132. - { 133. - image_size = load_image(\, qemu_get_ram_ptr(0x03f80000)) 134. - if (image_size < 0) 135. - image_size = load_image(\, qemu_get_ram_ptr(0x03f80000)); 136. - if (image_size > 0) { 137. : 138. diff --git a/hw/mini2440.c b/hw/mini2440.c 139. index 5decf4b..7a70aae 100644 140. --- a/hw/mini2440.c 141. +++ b/hw/mini2440.c 142. @@ -258,46 +258,15 @@ static void mini2440_reset(void *opaque) 143. struct mini2440_board_s *s = (struct mini2440_board_s *) opaque; 144. uint32_t image_size; 145. 146. - /* 147. - * Normally we would load 4 KB of nand to SRAM and jump there, but 148. - * it is not working perfectly as expected, so we cheat and load 149. - * it from nand directly relocated to 0x33f80000 and jump there 150. - */ 151. - if (mini2440_load_from_nand(s->nand, 0, S3C_RAM_BASE | 0x03f80000, 256*1024)> 0) { 152. - mini2440_printf(\); 153. - s->cpu->env->regs[15] = S3C_RAM_BASE | 0x03f80000; /* start address, u-boot 154. - } 155. -#if 0 && defined(LATER) 156. - if (mini2440_load_from_nand(s->nand, 0, S3C_SRAM_BASE_NANDBOOT, S3C_SRAM_SIZE) > 0) 157. - s->cpu->env->regs[15] = S3C_SRAM_BASE_NANDBOOT; /* start address, u-boot rel 158. - mini2440_printf(\ 159. - } 160. -#endif 161. - /* 162. - * if a u--boot is available as a file, we always use it 163. - */ 164. - { 165. - image_size = load_image(\, qemu_get_ram_ptr(0x03f80000)); 166. - if (image_size < 0)

167. - image_size = load_image(\, qemu_get_ram_ptr(0x03f80000)); 168. - if (image_size > 0) { 169. - if (image_size & (512 -1)) /* round size to a NAND block size * 170. - image_size = (image_size + 512) & ~(512-1); 171. - mini2440_printf(\ 172. : 173. diff --git a/hw/mini2440.c b/hw/mini2440.c 174. index 5decf4b..7a70aae 100644 175. --- a/hw/mini2440.c 176. +++ b/hw/mini2440.c 177. @@ -258,46 +258,15 @@ static void mini2440_reset(void *opaque) 178. struct mini2440_board_s *s = (struct mini2440_board_s *) opaque; 179. uint32_t image_size; 180. 181. - /* 182. - * Normally we would load 4 KB of nand to SRAM and jump there, but 183. - * it is not working perfectly as expected, so we cheat and load 184. - * it from nand directly relocated to 0x33f80000 and jump there 185. - */ 186. - if (mini2440_load_from_nand(s->nand, 0, S3C_RAM_BASE | 0x03f80000, 256*1024)> 0) { 187. - mini2440_printf(\); 188. - s->cpu->env->regs[15] = S3C_RAM_BASE | 0x03f80000; /* start address, u-boot alrea 189. - } 190. -#if 0 && defined(LATER) 191. - if (mini2440_load_from_nand(s->nand, 0, S3C_SRAM_BASE_NANDBOOT, S3C_SRAM_SIZE) > 0) { 192. - s->cpu->env->regs[15] = S3C_SRAM_BASE_NANDBOOT; /* start address, u-boot relocati 193. - mini2440_printf(\ 194. - } 195. -#endif 196. - /* 197. - * if a u--boot is available as a file, we always use it 198. - */ 199. - { 200. - image_size = load_image(\, qemu_get_ram_ptr(0x03f80000)); 201. - if (image_size < 0) 202. - image_size = load_image(\, qemu_get_ram_ptr(0x03f80000)); 203. - if (image_size > 0) { 204. - if (image_size & (512 -1)) /* round size to a NAND block size */