| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $Id: args_prep.c,v 1.2 2017/01/14 12:45:28 martin Exp $ */ | | 1 | /* $Id: args_prep.c,v 1.3 2017/01/14 21:57:20 christos Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright (c) 2012 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2012 The NetBSD Foundation, Inc. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
8 | * by Petri Laakso. | | 8 | * by Petri Laakso. |
9 | * | | 9 | * |
10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
12 | * are met: | | 12 | * are met: |
13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -72,28 +72,26 @@ | | | @@ -72,28 +72,26 @@ |
72 | | | 72 | |
73 | #include <lib/libsa/stand.h> | | 73 | #include <lib/libsa/stand.h> |
74 | #include <lib/libkern/libkern.h> | | 74 | #include <lib/libkern/libkern.h> |
75 | | | 75 | |
76 | #include <arm/arm32/pte.h> | | 76 | #include <arm/arm32/pte.h> |
77 | #define _LOCORE | | 77 | #define _LOCORE |
78 | #include <arm/imx/imx23var.h> | | 78 | #include <arm/imx/imx23var.h> |
79 | #undef _LOCORE | | 79 | #undef _LOCORE |
80 | #include <evbarm/bootconfig.h> | | 80 | #include <evbarm/bootconfig.h> |
81 | | | 81 | |
82 | #include <arm/imx/imx23_digctlreg.h> | | 82 | #include <arm/imx/imx23_digctlreg.h> |
83 | #include <arm/imx/imx23_uartdbgreg.h> | | 83 | #include <arm/imx/imx23_uartdbgreg.h> |
84 | | | 84 | |
85 | #include <string.h> | | | |
86 | | | | |
87 | #include "common.h" | | 85 | #include "common.h" |
88 | | | 86 | |
89 | static void ngets(char *, int); | | 87 | static void ngets(char *, int); |
90 | | | 88 | |
91 | #define L1_PAGE_TABLE (DRAM_BASE + MEMSIZE * 1024 * 1024 - L1_TABLE_SIZE) | | 89 | #define L1_PAGE_TABLE (DRAM_BASE + MEMSIZE * 1024 * 1024 - L1_TABLE_SIZE) |
92 | #define BOOTIMX23_ARGS (L1_PAGE_TABLE - MAX_BOOT_STRING - 1) | | 90 | #define BOOTIMX23_ARGS (L1_PAGE_TABLE - MAX_BOOT_STRING - 1) |
93 | | | 91 | |
94 | #define PROMPT_DELAY 5000000 /* Wait 5 seconds user to press any key. */ | | 92 | #define PROMPT_DELAY 5000000 /* Wait 5 seconds user to press any key. */ |
95 | | | 93 | |
96 | int | | 94 | int |
97 | args_prep(void) | | 95 | args_prep(void) |
98 | { | | 96 | { |
99 | u_int prompt; | | 97 | u_int prompt; |