Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8ec6e332eace0ee78c71ee5f645d12b06813b86f

Authored by Tor Krill
Committed by Wolfgang Denk
1 parent b64b8a0bd3
Exists in master and in 57 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Fix incorrect switch for IF_TYPE in part.c 

Use correct field in block_dev_desc_t when writing interface type in
dev_print. Error introduced in 574b3195.

Also added fix from Martin Krause

Signed-off-by: Tor Krill <tor@excito.com>

Showing 1 changed file with 2 additions and 2 deletions Inline Diff

1 /* 1 /*
2 * (C) Copyright 2001 2 * (C) Copyright 2001
3 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. 3 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 * 4 *
5 * See file CREDITS for list of people who contributed to this 5 * See file CREDITS for list of people who contributed to this
6 * project. 6 * project.
7 * 7 *
8 * This program is free software; you can redistribute it and/or 8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License as 9 * modify it under the terms of the GNU General Public License as
10 * published by the Free Software Foundation; either version 2 of 10 * published by the Free Software Foundation; either version 2 of
11 * the License, or (at your option) any later version. 11 * the License, or (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21 * MA 02111-1307 USA 21 * MA 02111-1307 USA
22 */ 22 */
23 23
24 #include <common.h> 24 #include <common.h>
25 #include <command.h> 25 #include <command.h>
26 #include <ide.h> 26 #include <ide.h>
27 #include <part.h> 27 #include <part.h>
28 28
29 #undef PART_DEBUG 29 #undef PART_DEBUG
30 30
31 #ifdef PART_DEBUG 31 #ifdef PART_DEBUG
32 #define PRINTF(fmt,args...) printf (fmt ,##args) 32 #define PRINTF(fmt,args...) printf (fmt ,##args)
33 #else 33 #else
34 #define PRINTF(fmt,args...) 34 #define PRINTF(fmt,args...)
35 #endif 35 #endif
36 36
37 #if (defined(CONFIG_CMD_IDE) || \ 37 #if (defined(CONFIG_CMD_IDE) || \
38 defined(CONFIG_CMD_SATA) || \ 38 defined(CONFIG_CMD_SATA) || \
39 defined(CONFIG_CMD_SCSI) || \ 39 defined(CONFIG_CMD_SCSI) || \
40 defined(CONFIG_CMD_USB) || \ 40 defined(CONFIG_CMD_USB) || \
41 defined(CONFIG_MMC) || \ 41 defined(CONFIG_MMC) || \
42 defined(CONFIG_SYSTEMACE) ) 42 defined(CONFIG_SYSTEMACE) )
43 43
44 struct block_drvr { 44 struct block_drvr {
45 char *name; 45 char *name;
46 block_dev_desc_t* (*get_dev)(int dev); 46 block_dev_desc_t* (*get_dev)(int dev);
47 }; 47 };
48 48
49 static const struct block_drvr block_drvr[] = { 49 static const struct block_drvr block_drvr[] = {
50 #if defined(CONFIG_CMD_IDE) 50 #if defined(CONFIG_CMD_IDE)
51 { .name = "ide", .get_dev = ide_get_dev, }, 51 { .name = "ide", .get_dev = ide_get_dev, },
52 #endif 52 #endif
53 #if defined(CONFIG_CMD_SATA) 53 #if defined(CONFIG_CMD_SATA)
54 {.name = "sata", .get_dev = sata_get_dev, }, 54 {.name = "sata", .get_dev = sata_get_dev, },
55 #endif 55 #endif
56 #if defined(CONFIG_CMD_SCSI) 56 #if defined(CONFIG_CMD_SCSI)
57 { .name = "scsi", .get_dev = scsi_get_dev, }, 57 { .name = "scsi", .get_dev = scsi_get_dev, },
58 #endif 58 #endif
59 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE) 59 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
60 { .name = "usb", .get_dev = usb_stor_get_dev, }, 60 { .name = "usb", .get_dev = usb_stor_get_dev, },
61 #endif 61 #endif
62 #if defined(CONFIG_MMC) 62 #if defined(CONFIG_MMC)
63 { .name = "mmc", .get_dev = mmc_get_dev, }, 63 { .name = "mmc", .get_dev = mmc_get_dev, },
64 #endif 64 #endif
65 #if defined(CONFIG_SYSTEMACE) 65 #if defined(CONFIG_SYSTEMACE)
66 { .name = "ace", .get_dev = systemace_get_dev, }, 66 { .name = "ace", .get_dev = systemace_get_dev, },
67 #endif 67 #endif
68 { }, 68 { },
69 }; 69 };
70 70
71 DECLARE_GLOBAL_DATA_PTR; 71 DECLARE_GLOBAL_DATA_PTR;
72 72
73 block_dev_desc_t *get_dev(char* ifname, int dev) 73 block_dev_desc_t *get_dev(char* ifname, int dev)
74 { 74 {
75 const struct block_drvr *drvr = block_drvr; 75 const struct block_drvr *drvr = block_drvr;
76 block_dev_desc_t* (*reloc_get_dev)(int dev); 76 block_dev_desc_t* (*reloc_get_dev)(int dev);
77 77
78 while (drvr->name) { 78 while (drvr->name) {
79 reloc_get_dev = drvr->get_dev + gd->reloc_off; 79 reloc_get_dev = drvr->get_dev + gd->reloc_off;
80 if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0) 80 if (strncmp(ifname, drvr->name, strlen(drvr->name)) == 0)
81 return reloc_get_dev(dev); 81 return reloc_get_dev(dev);
82 drvr++; 82 drvr++;
83 } 83 }
84 return NULL; 84 return NULL;
85 } 85 }
86 #else 86 #else
87 block_dev_desc_t *get_dev(char* ifname, int dev) 87 block_dev_desc_t *get_dev(char* ifname, int dev)
88 { 88 {
89 return NULL; 89 return NULL;
90 } 90 }
91 #endif 91 #endif
92 92
93 #if (defined(CONFIG_CMD_IDE) || \ 93 #if (defined(CONFIG_CMD_IDE) || \
94 defined(CONFIG_CMD_SATA) || \ 94 defined(CONFIG_CMD_SATA) || \
95 defined(CONFIG_CMD_SCSI) || \ 95 defined(CONFIG_CMD_SCSI) || \
96 defined(CONFIG_CMD_USB) || \ 96 defined(CONFIG_CMD_USB) || \
97 defined(CONFIG_MMC) || \ 97 defined(CONFIG_MMC) || \
98 defined(CONFIG_SYSTEMACE) ) 98 defined(CONFIG_SYSTEMACE) )
99 99
100 /* ------------------------------------------------------------------------- */ 100 /* ------------------------------------------------------------------------- */
101 /* 101 /*
102 * reports device info to the user 102 * reports device info to the user
103 */ 103 */
104 void dev_print (block_dev_desc_t *dev_desc) 104 void dev_print (block_dev_desc_t *dev_desc)
105 { 105 {
106 #ifdef CONFIG_LBA48 106 #ifdef CONFIG_LBA48
107 uint64_t lba512; /* number of blocks if 512bytes block size */ 107 uint64_t lba512; /* number of blocks if 512bytes block size */
108 #else 108 #else
109 lbaint_t lba512; 109 lbaint_t lba512;
110 #endif 110 #endif
111 111
112 switch (dev_desc->type) { 112 switch (dev_desc->if_type) {
113 case IF_TYPE_SCSI: 113 case IF_TYPE_SCSI:
114 printf ("(%d:%d) Vendor: %s Prod.: %s Rev: %s\n", 114 printf ("(%d:%d) Vendor: %s Prod.: %s Rev: %s\n",
115 dev_desc->target,dev_desc->lun, 115 dev_desc->target,dev_desc->lun,
116 dev_desc->vendor, 116 dev_desc->vendor,
117 dev_desc->product, 117 dev_desc->product,
118 dev_desc->revision); 118 dev_desc->revision);
119 break; 119 break;
120 case IF_TYPE_IDE: 120 case IF_TYPE_IDE:
121 case IF_TYPE_SATA: 121 case IF_TYPE_SATA:
122 printf ("Model: %s Firm: %s Ser#: %s\n", 122 printf ("Model: %s Firm: %s Ser#: %s\n",
123 dev_desc->vendor, 123 dev_desc->vendor,
124 dev_desc->revision, 124 dev_desc->revision,
125 dev_desc->product); 125 dev_desc->product);
126 break; 126 break;
127 case DEV_TYPE_UNKNOWN: 127 case IF_TYPE_UNKNOWN:
128 default: 128 default:
129 puts ("not available\n"); 129 puts ("not available\n");
130 return; 130 return;
131 } 131 }
132 puts (" Type: "); 132 puts (" Type: ");
133 if (dev_desc->removable) 133 if (dev_desc->removable)
134 puts ("Removable "); 134 puts ("Removable ");
135 switch (dev_desc->type & 0x1F) { 135 switch (dev_desc->type & 0x1F) {
136 case DEV_TYPE_HARDDISK: 136 case DEV_TYPE_HARDDISK:
137 puts ("Hard Disk"); 137 puts ("Hard Disk");
138 break; 138 break;
139 case DEV_TYPE_CDROM: 139 case DEV_TYPE_CDROM:
140 puts ("CD ROM"); 140 puts ("CD ROM");
141 break; 141 break;
142 case DEV_TYPE_OPDISK: 142 case DEV_TYPE_OPDISK:
143 puts ("Optical Device"); 143 puts ("Optical Device");
144 break; 144 break;
145 case DEV_TYPE_TAPE: 145 case DEV_TYPE_TAPE:
146 puts ("Tape"); 146 puts ("Tape");
147 break; 147 break;
148 default: 148 default:
149 printf ("# %02X #", dev_desc->type & 0x1F); 149 printf ("# %02X #", dev_desc->type & 0x1F);
150 break; 150 break;
151 } 151 }
152 puts ("\n"); 152 puts ("\n");
153 if ((dev_desc->lba * dev_desc->blksz)>0L) { 153 if ((dev_desc->lba * dev_desc->blksz)>0L) {
154 ulong mb, mb_quot, mb_rem, gb, gb_quot, gb_rem; 154 ulong mb, mb_quot, mb_rem, gb, gb_quot, gb_rem;
155 lbaint_t lba; 155 lbaint_t lba;
156 156
157 lba = dev_desc->lba; 157 lba = dev_desc->lba;
158 158
159 lba512 = (lba * (dev_desc->blksz/512)); 159 lba512 = (lba * (dev_desc->blksz/512));
160 mb = (10 * lba512) / 2048; /* 2048 = (1024 * 1024) / 512 MB */ 160 mb = (10 * lba512) / 2048; /* 2048 = (1024 * 1024) / 512 MB */
161 /* round to 1 digit */ 161 /* round to 1 digit */
162 mb_quot = mb / 10; 162 mb_quot = mb / 10;
163 mb_rem = mb - (10 * mb_quot); 163 mb_rem = mb - (10 * mb_quot);
164 164
165 gb = mb / 1024; 165 gb = mb / 1024;
166 gb_quot = gb / 10; 166 gb_quot = gb / 10;
167 gb_rem = gb - (10 * gb_quot); 167 gb_rem = gb - (10 * gb_quot);
168 #ifdef CONFIG_LBA48 168 #ifdef CONFIG_LBA48
169 if (dev_desc->lba48) 169 if (dev_desc->lba48)
170 printf (" Supports 48-bit addressing\n"); 170 printf (" Supports 48-bit addressing\n");
171 #endif 171 #endif
172 #if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF) 172 #if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF)
173 printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%qd x %ld)\n", 173 printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%qd x %ld)\n",
174 mb_quot, mb_rem, 174 mb_quot, mb_rem,
175 gb_quot, gb_rem, 175 gb_quot, gb_rem,
176 lba, 176 lba,
177 dev_desc->blksz); 177 dev_desc->blksz);
178 #else 178 #else
179 printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n", 179 printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n",
180 mb_quot, mb_rem, 180 mb_quot, mb_rem,
181 gb_quot, gb_rem, 181 gb_quot, gb_rem,
182 (ulong)lba, 182 (ulong)lba,
183 dev_desc->blksz); 183 dev_desc->blksz);
184 #endif 184 #endif
185 } else { 185 } else {
186 puts (" Capacity: not available\n"); 186 puts (" Capacity: not available\n");
187 } 187 }
188 } 188 }
189 #endif 189 #endif
190 190
191 #if (defined(CONFIG_CMD_IDE) || \ 191 #if (defined(CONFIG_CMD_IDE) || \
192 defined(CONFIG_CMD_SATA) || \ 192 defined(CONFIG_CMD_SATA) || \
193 defined(CONFIG_CMD_SCSI) || \ 193 defined(CONFIG_CMD_SCSI) || \
194 defined(CONFIG_CMD_USB) || \ 194 defined(CONFIG_CMD_USB) || \
195 defined(CONFIG_MMC) || \ 195 defined(CONFIG_MMC) || \
196 defined(CONFIG_SYSTEMACE) ) 196 defined(CONFIG_SYSTEMACE) )
197 197
198 #if defined(CONFIG_MAC_PARTITION) || \ 198 #if defined(CONFIG_MAC_PARTITION) || \
199 defined(CONFIG_DOS_PARTITION) || \ 199 defined(CONFIG_DOS_PARTITION) || \
200 defined(CONFIG_ISO_PARTITION) || \ 200 defined(CONFIG_ISO_PARTITION) || \
201 defined(CONFIG_AMIGA_PARTITION) 201 defined(CONFIG_AMIGA_PARTITION)
202 202
203 void init_part (block_dev_desc_t * dev_desc) 203 void init_part (block_dev_desc_t * dev_desc)
204 { 204 {
205 #ifdef CONFIG_ISO_PARTITION 205 #ifdef CONFIG_ISO_PARTITION
206 if (test_part_iso(dev_desc) == 0) { 206 if (test_part_iso(dev_desc) == 0) {
207 dev_desc->part_type = PART_TYPE_ISO; 207 dev_desc->part_type = PART_TYPE_ISO;
208 return; 208 return;
209 } 209 }
210 #endif 210 #endif
211 211
212 #ifdef CONFIG_MAC_PARTITION 212 #ifdef CONFIG_MAC_PARTITION
213 if (test_part_mac(dev_desc) == 0) { 213 if (test_part_mac(dev_desc) == 0) {
214 dev_desc->part_type = PART_TYPE_MAC; 214 dev_desc->part_type = PART_TYPE_MAC;
215 return; 215 return;
216 } 216 }
217 #endif 217 #endif
218 218
219 #ifdef CONFIG_DOS_PARTITION 219 #ifdef CONFIG_DOS_PARTITION
220 if (test_part_dos(dev_desc) == 0) { 220 if (test_part_dos(dev_desc) == 0) {
221 dev_desc->part_type = PART_TYPE_DOS; 221 dev_desc->part_type = PART_TYPE_DOS;
222 return; 222 return;
223 } 223 }
224 #endif 224 #endif
225 225
226 #ifdef CONFIG_AMIGA_PARTITION 226 #ifdef CONFIG_AMIGA_PARTITION
227 if (test_part_amiga(dev_desc) == 0) { 227 if (test_part_amiga(dev_desc) == 0) {
228 dev_desc->part_type = PART_TYPE_AMIGA; 228 dev_desc->part_type = PART_TYPE_AMIGA;
229 return; 229 return;
230 } 230 }
231 #endif 231 #endif
232 } 232 }
233 233
234 234
235 int get_partition_info (block_dev_desc_t *dev_desc, int part 235 int get_partition_info (block_dev_desc_t *dev_desc, int part
236 , disk_partition_t *info) 236 , disk_partition_t *info)
237 { 237 {
238 switch (dev_desc->part_type) { 238 switch (dev_desc->part_type) {
239 #ifdef CONFIG_MAC_PARTITION 239 #ifdef CONFIG_MAC_PARTITION
240 case PART_TYPE_MAC: 240 case PART_TYPE_MAC:
241 if (get_partition_info_mac(dev_desc,part,info) == 0) { 241 if (get_partition_info_mac(dev_desc,part,info) == 0) {
242 PRINTF ("## Valid MAC partition found ##\n"); 242 PRINTF ("## Valid MAC partition found ##\n");
243 return (0); 243 return (0);
244 } 244 }
245 break; 245 break;
246 #endif 246 #endif
247 247
248 #ifdef CONFIG_DOS_PARTITION 248 #ifdef CONFIG_DOS_PARTITION
249 case PART_TYPE_DOS: 249 case PART_TYPE_DOS:
250 if (get_partition_info_dos(dev_desc,part,info) == 0) { 250 if (get_partition_info_dos(dev_desc,part,info) == 0) {
251 PRINTF ("## Valid DOS partition found ##\n"); 251 PRINTF ("## Valid DOS partition found ##\n");
252 return (0); 252 return (0);
253 } 253 }
254 break; 254 break;
255 #endif 255 #endif
256 256
257 #ifdef CONFIG_ISO_PARTITION 257 #ifdef CONFIG_ISO_PARTITION
258 case PART_TYPE_ISO: 258 case PART_TYPE_ISO:
259 if (get_partition_info_iso(dev_desc,part,info) == 0) { 259 if (get_partition_info_iso(dev_desc,part,info) == 0) {
260 PRINTF ("## Valid ISO boot partition found ##\n"); 260 PRINTF ("## Valid ISO boot partition found ##\n");
261 return (0); 261 return (0);
262 } 262 }
263 break; 263 break;
264 #endif 264 #endif
265 265
266 #ifdef CONFIG_AMIGA_PARTITION 266 #ifdef CONFIG_AMIGA_PARTITION
267 case PART_TYPE_AMIGA: 267 case PART_TYPE_AMIGA:
268 if (get_partition_info_amiga(dev_desc, part, info) == 0) 268 if (get_partition_info_amiga(dev_desc, part, info) == 0)
269 { 269 {
270 PRINTF ("## Valid Amiga partition found ##\n"); 270 PRINTF ("## Valid Amiga partition found ##\n");
271 return (0); 271 return (0);
272 } 272 }
273 break; 273 break;
274 #endif 274 #endif
275 default: 275 default:
276 break; 276 break;
277 } 277 }
278 return (-1); 278 return (-1);
279 } 279 }
280 280
281 static void print_part_header (const char *type, block_dev_desc_t * dev_desc) 281 static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
282 { 282 {
283 puts ("\nPartition Map for "); 283 puts ("\nPartition Map for ");
284 switch (dev_desc->if_type) { 284 switch (dev_desc->if_type) {
285 case IF_TYPE_IDE: 285 case IF_TYPE_IDE:
286 puts ("IDE"); 286 puts ("IDE");
287 break; 287 break;
288 case IF_TYPE_SATA: 288 case IF_TYPE_SATA:
289 puts ("SATA"); 289 puts ("SATA");
290 break; 290 break;
291 case IF_TYPE_SCSI: 291 case IF_TYPE_SCSI:
292 puts ("SCSI"); 292 puts ("SCSI");
293 break; 293 break;
294 case IF_TYPE_ATAPI: 294 case IF_TYPE_ATAPI:
295 puts ("ATAPI"); 295 puts ("ATAPI");
296 break; 296 break;
297 case IF_TYPE_USB: 297 case IF_TYPE_USB:
298 puts ("USB"); 298 puts ("USB");
299 break; 299 break;
300 case IF_TYPE_DOC: 300 case IF_TYPE_DOC:
301 puts ("DOC"); 301 puts ("DOC");
302 break; 302 break;
303 default: 303 default:
304 puts ("UNKNOWN"); 304 puts ("UNKNOWN");
305 break; 305 break;
306 } 306 }
307 printf (" device %d -- Partition Type: %s\n\n", 307 printf (" device %d -- Partition Type: %s\n\n",
308 dev_desc->dev, type); 308 dev_desc->dev, type);
309 } 309 }
310 310
311 void print_part (block_dev_desc_t * dev_desc) 311 void print_part (block_dev_desc_t * dev_desc)
312 { 312 {
313 313
314 switch (dev_desc->part_type) { 314 switch (dev_desc->part_type) {
315 #ifdef CONFIG_MAC_PARTITION 315 #ifdef CONFIG_MAC_PARTITION
316 case PART_TYPE_MAC: 316 case PART_TYPE_MAC:
317 PRINTF ("## Testing for valid MAC partition ##\n"); 317 PRINTF ("## Testing for valid MAC partition ##\n");
318 print_part_header ("MAC", dev_desc); 318 print_part_header ("MAC", dev_desc);
319 print_part_mac (dev_desc); 319 print_part_mac (dev_desc);
320 return; 320 return;
321 #endif 321 #endif
322 #ifdef CONFIG_DOS_PARTITION 322 #ifdef CONFIG_DOS_PARTITION
323 case PART_TYPE_DOS: 323 case PART_TYPE_DOS:
324 PRINTF ("## Testing for valid DOS partition ##\n"); 324 PRINTF ("## Testing for valid DOS partition ##\n");
325 print_part_header ("DOS", dev_desc); 325 print_part_header ("DOS", dev_desc);
326 print_part_dos (dev_desc); 326 print_part_dos (dev_desc);
327 return; 327 return;
328 #endif 328 #endif
329 329
330 #ifdef CONFIG_ISO_PARTITION 330 #ifdef CONFIG_ISO_PARTITION
331 case PART_TYPE_ISO: 331 case PART_TYPE_ISO:
332 PRINTF ("## Testing for valid ISO Boot partition ##\n"); 332 PRINTF ("## Testing for valid ISO Boot partition ##\n");
333 print_part_header ("ISO", dev_desc); 333 print_part_header ("ISO", dev_desc);
334 print_part_iso (dev_desc); 334 print_part_iso (dev_desc);
335 return; 335 return;
336 #endif 336 #endif
337 337
338 #ifdef CONFIG_AMIGA_PARTITION 338 #ifdef CONFIG_AMIGA_PARTITION
339 case PART_TYPE_AMIGA: 339 case PART_TYPE_AMIGA:
340 PRINTF ("## Testing for a valid Amiga partition ##\n"); 340 PRINTF ("## Testing for a valid Amiga partition ##\n");
341 print_part_header ("AMIGA", dev_desc); 341 print_part_header ("AMIGA", dev_desc);
342 print_part_amiga (dev_desc); 342 print_part_amiga (dev_desc);
343 return; 343 return;
344 #endif 344 #endif
345 } 345 }
346 puts ("## Unknown partition table\n"); 346 puts ("## Unknown partition table\n");
347 } 347 }
348 348
349 349
350 #else /* neither MAC nor DOS nor ISO partition configured */ 350 #else /* neither MAC nor DOS nor ISO partition configured */
351 # error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION 351 # error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION
352 # error nor CONFIG_ISO_PARTITION configured! 352 # error nor CONFIG_ISO_PARTITION configured!
353 #endif 353 #endif
354 354
355 #endif 355 #endif
356 356