Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6b423b752b24bf69962821754314418621fc71cc

Authored by Mateusz Zalega
Committed by Lukasz Majewski
1 parent 07a2d42cd4
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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-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_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, 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

part: header fix 

Implementation made use of types defined in common.h, even though it
wasn't #included. It worked in circumstances when .c files included
every needed header (all).

Signed-off-by: Mateusz Zalega <m.zalega@samsung.com>
Cc: Tom Rini <trini@ti.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>

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

1 /* 1 /*
2 * (C) Copyright 2000-2004 2 * (C) Copyright 2000-2004
3 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. 3 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 * 4 *
5 * SPDX-License-Identifier: GPL-2.0+ 5 * SPDX-License-Identifier: GPL-2.0+
6 */ 6 */
7 #ifndef _PART_H 7 #ifndef _PART_H
8 #define _PART_H 8 #define _PART_H
9 9
10 #include <ide.h> 10 #include <ide.h>
11 #include <common.h>
11 12
12 typedef struct block_dev_desc { 13 typedef struct block_dev_desc {
13 int if_type; /* type of the interface */ 14 int if_type; /* type of the interface */
14 int dev; /* device number */ 15 int dev; /* device number */
15 unsigned char part_type; /* partition type */ 16 unsigned char part_type; /* partition type */
16 unsigned char target; /* target SCSI ID */ 17 unsigned char target; /* target SCSI ID */
17 unsigned char lun; /* target LUN */ 18 unsigned char lun; /* target LUN */
18 unsigned char type; /* device type */ 19 unsigned char type; /* device type */
19 unsigned char removable; /* removable device */ 20 unsigned char removable; /* removable device */
20 #ifdef CONFIG_LBA48 21 #ifdef CONFIG_LBA48
21 unsigned char lba48; /* device can use 48bit addr (ATA/ATAPI v7) */ 22 unsigned char lba48; /* device can use 48bit addr (ATA/ATAPI v7) */
22 #endif 23 #endif
23 lbaint_t lba; /* number of blocks */ 24 lbaint_t lba; /* number of blocks */
24 unsigned long blksz; /* block size */ 25 unsigned long blksz; /* block size */
25 int log2blksz; /* for convenience: log2(blksz) */ 26 int log2blksz; /* for convenience: log2(blksz) */
26 char vendor [40+1]; /* IDE model, SCSI Vendor */ 27 char vendor [40+1]; /* IDE model, SCSI Vendor */
27 char product[20+1]; /* IDE Serial no, SCSI product */ 28 char product[20+1]; /* IDE Serial no, SCSI product */
28 char revision[8+1]; /* firmware revision */ 29 char revision[8+1]; /* firmware revision */
29 unsigned long (*block_read)(int dev, 30 unsigned long (*block_read)(int dev,
30 lbaint_t start, 31 lbaint_t start,
31 lbaint_t blkcnt, 32 lbaint_t blkcnt,
32 void *buffer); 33 void *buffer);
33 unsigned long (*block_write)(int dev, 34 unsigned long (*block_write)(int dev,
34 lbaint_t start, 35 lbaint_t start,
35 lbaint_t blkcnt, 36 lbaint_t blkcnt,
36 const void *buffer); 37 const void *buffer);
37 unsigned long (*block_erase)(int dev, 38 unsigned long (*block_erase)(int dev,
38 lbaint_t start, 39 lbaint_t start,
39 lbaint_t blkcnt); 40 lbaint_t blkcnt);
40 void *priv; /* driver private struct pointer */ 41 void *priv; /* driver private struct pointer */
41 }block_dev_desc_t; 42 }block_dev_desc_t;
42 43
43 #define BLOCK_CNT(size, block_dev_desc) (PAD_COUNT(size, block_dev_desc->blksz)) 44 #define BLOCK_CNT(size, block_dev_desc) (PAD_COUNT(size, block_dev_desc->blksz))
44 #define PAD_TO_BLOCKSIZE(size, block_dev_desc) \ 45 #define PAD_TO_BLOCKSIZE(size, block_dev_desc) \
45 (PAD_SIZE(size, block_dev_desc->blksz)) 46 (PAD_SIZE(size, block_dev_desc->blksz))
46 #define LOG2(x) (((x & 0xaaaaaaaa) ? 1 : 0) + ((x & 0xcccccccc) ? 2 : 0) + \ 47 #define LOG2(x) (((x & 0xaaaaaaaa) ? 1 : 0) + ((x & 0xcccccccc) ? 2 : 0) + \
47 ((x & 0xf0f0f0f0) ? 4 : 0) + ((x & 0xff00ff00) ? 8 : 0) + \ 48 ((x & 0xf0f0f0f0) ? 4 : 0) + ((x & 0xff00ff00) ? 8 : 0) + \
48 ((x & 0xffff0000) ? 16 : 0)) 49 ((x & 0xffff0000) ? 16 : 0))
49 #define LOG2_INVALID(type) ((type)((sizeof(type)<<3)-1)) 50 #define LOG2_INVALID(type) ((type)((sizeof(type)<<3)-1))
50 51
51 /* Interface types: */ 52 /* Interface types: */
52 #define IF_TYPE_UNKNOWN 0 53 #define IF_TYPE_UNKNOWN 0
53 #define IF_TYPE_IDE 1 54 #define IF_TYPE_IDE 1
54 #define IF_TYPE_SCSI 2 55 #define IF_TYPE_SCSI 2
55 #define IF_TYPE_ATAPI 3 56 #define IF_TYPE_ATAPI 3
56 #define IF_TYPE_USB 4 57 #define IF_TYPE_USB 4
57 #define IF_TYPE_DOC 5 58 #define IF_TYPE_DOC 5
58 #define IF_TYPE_MMC 6 59 #define IF_TYPE_MMC 6
59 #define IF_TYPE_SD 7 60 #define IF_TYPE_SD 7
60 #define IF_TYPE_SATA 8 61 #define IF_TYPE_SATA 8
61 #define IF_TYPE_HOST 9 62 #define IF_TYPE_HOST 9
62 #define IF_TYPE_MAX 10 /* Max number of IF_TYPE_* supported */ 63 #define IF_TYPE_MAX 10 /* Max number of IF_TYPE_* supported */
63 64
64 /* Part types */ 65 /* Part types */
65 #define PART_TYPE_UNKNOWN 0x00 66 #define PART_TYPE_UNKNOWN 0x00
66 #define PART_TYPE_MAC 0x01 67 #define PART_TYPE_MAC 0x01
67 #define PART_TYPE_DOS 0x02 68 #define PART_TYPE_DOS 0x02
68 #define PART_TYPE_ISO 0x03 69 #define PART_TYPE_ISO 0x03
69 #define PART_TYPE_AMIGA 0x04 70 #define PART_TYPE_AMIGA 0x04
70 #define PART_TYPE_EFI 0x05 71 #define PART_TYPE_EFI 0x05
71 72
72 /* 73 /*
73 * Type string for U-Boot bootable partitions 74 * Type string for U-Boot bootable partitions
74 */ 75 */
75 #define BOOT_PART_TYPE "U-Boot" /* primary boot partition type */ 76 #define BOOT_PART_TYPE "U-Boot" /* primary boot partition type */
76 #define BOOT_PART_COMP "PPCBoot" /* PPCBoot compatibility type */ 77 #define BOOT_PART_COMP "PPCBoot" /* PPCBoot compatibility type */
77 78
78 /* device types */ 79 /* device types */
79 #define DEV_TYPE_UNKNOWN 0xff /* not connected */ 80 #define DEV_TYPE_UNKNOWN 0xff /* not connected */
80 #define DEV_TYPE_HARDDISK 0x00 /* harddisk */ 81 #define DEV_TYPE_HARDDISK 0x00 /* harddisk */
81 #define DEV_TYPE_TAPE 0x01 /* Tape */ 82 #define DEV_TYPE_TAPE 0x01 /* Tape */
82 #define DEV_TYPE_CDROM 0x05 /* CD-ROM */ 83 #define DEV_TYPE_CDROM 0x05 /* CD-ROM */
83 #define DEV_TYPE_OPDISK 0x07 /* optical disk */ 84 #define DEV_TYPE_OPDISK 0x07 /* optical disk */
84 85
85 typedef struct disk_partition { 86 typedef struct disk_partition {
86 lbaint_t start; /* # of first block in partition */ 87 lbaint_t start; /* # of first block in partition */
87 lbaint_t size; /* number of blocks in partition */ 88 lbaint_t size; /* number of blocks in partition */
88 ulong blksz; /* block size in bytes */ 89 ulong blksz; /* block size in bytes */
89 uchar name[32]; /* partition name */ 90 uchar name[32]; /* partition name */
90 uchar type[32]; /* string type description */ 91 uchar type[32]; /* string type description */
91 int bootable; /* Active/Bootable flag is set */ 92 int bootable; /* Active/Bootable flag is set */
92 #ifdef CONFIG_PARTITION_UUIDS 93 #ifdef CONFIG_PARTITION_UUIDS
93 char uuid[37]; /* filesystem UUID as string, if exists */ 94 char uuid[37]; /* filesystem UUID as string, if exists */
94 #endif 95 #endif
95 } disk_partition_t; 96 } disk_partition_t;
96 97
97 /* Misc _get_dev functions */ 98 /* Misc _get_dev functions */
98 #ifdef CONFIG_PARTITIONS 99 #ifdef CONFIG_PARTITIONS
99 block_dev_desc_t *get_dev(const char *ifname, int dev); 100 block_dev_desc_t *get_dev(const char *ifname, int dev);
100 block_dev_desc_t* ide_get_dev(int dev); 101 block_dev_desc_t* ide_get_dev(int dev);
101 block_dev_desc_t* sata_get_dev(int dev); 102 block_dev_desc_t* sata_get_dev(int dev);
102 block_dev_desc_t* scsi_get_dev(int dev); 103 block_dev_desc_t* scsi_get_dev(int dev);
103 block_dev_desc_t* usb_stor_get_dev(int dev); 104 block_dev_desc_t* usb_stor_get_dev(int dev);
104 block_dev_desc_t* mmc_get_dev(int dev); 105 block_dev_desc_t* mmc_get_dev(int dev);
105 block_dev_desc_t* systemace_get_dev(int dev); 106 block_dev_desc_t* systemace_get_dev(int dev);
106 block_dev_desc_t* mg_disk_get_dev(int dev); 107 block_dev_desc_t* mg_disk_get_dev(int dev);
107 block_dev_desc_t *host_get_dev(int dev); 108 block_dev_desc_t *host_get_dev(int dev);
108 int host_get_dev_err(int dev, block_dev_desc_t **blk_devp); 109 int host_get_dev_err(int dev, block_dev_desc_t **blk_devp);
109 110
110 /* disk/part.c */ 111 /* disk/part.c */
111 int get_partition_info (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); 112 int get_partition_info (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
112 void print_part (block_dev_desc_t *dev_desc); 113 void print_part (block_dev_desc_t *dev_desc);
113 void init_part (block_dev_desc_t *dev_desc); 114 void init_part (block_dev_desc_t *dev_desc);
114 void dev_print(block_dev_desc_t *dev_desc); 115 void dev_print(block_dev_desc_t *dev_desc);
115 int get_device(const char *ifname, const char *dev_str, 116 int get_device(const char *ifname, const char *dev_str,
116 block_dev_desc_t **dev_desc); 117 block_dev_desc_t **dev_desc);
117 int get_device_and_partition(const char *ifname, const char *dev_part_str, 118 int get_device_and_partition(const char *ifname, const char *dev_part_str,
118 block_dev_desc_t **dev_desc, 119 block_dev_desc_t **dev_desc,
119 disk_partition_t *info, int allow_whole_dev); 120 disk_partition_t *info, int allow_whole_dev);
120 #else 121 #else
121 static inline block_dev_desc_t *get_dev(const char *ifname, int dev) 122 static inline block_dev_desc_t *get_dev(const char *ifname, int dev)
122 { return NULL; } 123 { return NULL; }
123 static inline block_dev_desc_t* ide_get_dev(int dev) { return NULL; } 124 static inline block_dev_desc_t* ide_get_dev(int dev) { return NULL; }
124 static inline block_dev_desc_t* sata_get_dev(int dev) { return NULL; } 125 static inline block_dev_desc_t* sata_get_dev(int dev) { return NULL; }
125 static inline block_dev_desc_t* scsi_get_dev(int dev) { return NULL; } 126 static inline block_dev_desc_t* scsi_get_dev(int dev) { return NULL; }
126 static inline block_dev_desc_t* usb_stor_get_dev(int dev) { return NULL; } 127 static inline block_dev_desc_t* usb_stor_get_dev(int dev) { return NULL; }
127 static inline block_dev_desc_t* mmc_get_dev(int dev) { return NULL; } 128 static inline block_dev_desc_t* mmc_get_dev(int dev) { return NULL; }
128 static inline block_dev_desc_t* systemace_get_dev(int dev) { return NULL; } 129 static inline block_dev_desc_t* systemace_get_dev(int dev) { return NULL; }
129 static inline block_dev_desc_t* mg_disk_get_dev(int dev) { return NULL; } 130 static inline block_dev_desc_t* mg_disk_get_dev(int dev) { return NULL; }
130 static inline block_dev_desc_t *host_get_dev(int dev) { return NULL; } 131 static inline block_dev_desc_t *host_get_dev(int dev) { return NULL; }
131 132
132 static inline int get_partition_info (block_dev_desc_t * dev_desc, int part, 133 static inline int get_partition_info (block_dev_desc_t * dev_desc, int part,
133 disk_partition_t *info) { return -1; } 134 disk_partition_t *info) { return -1; }
134 static inline void print_part (block_dev_desc_t *dev_desc) {} 135 static inline void print_part (block_dev_desc_t *dev_desc) {}
135 static inline void init_part (block_dev_desc_t *dev_desc) {} 136 static inline void init_part (block_dev_desc_t *dev_desc) {}
136 static inline void dev_print(block_dev_desc_t *dev_desc) {} 137 static inline void dev_print(block_dev_desc_t *dev_desc) {}
137 static inline int get_device(const char *ifname, const char *dev_str, 138 static inline int get_device(const char *ifname, const char *dev_str,
138 block_dev_desc_t **dev_desc) 139 block_dev_desc_t **dev_desc)
139 { return -1; } 140 { return -1; }
140 static inline int get_device_and_partition(const char *ifname, 141 static inline int get_device_and_partition(const char *ifname,
141 const char *dev_part_str, 142 const char *dev_part_str,
142 block_dev_desc_t **dev_desc, 143 block_dev_desc_t **dev_desc,
143 disk_partition_t *info, 144 disk_partition_t *info,
144 int allow_whole_dev) 145 int allow_whole_dev)
145 { *dev_desc = NULL; return -1; } 146 { *dev_desc = NULL; return -1; }
146 #endif 147 #endif
147 148
148 #ifdef CONFIG_MAC_PARTITION 149 #ifdef CONFIG_MAC_PARTITION
149 /* disk/part_mac.c */ 150 /* disk/part_mac.c */
150 int get_partition_info_mac (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); 151 int get_partition_info_mac (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
151 void print_part_mac (block_dev_desc_t *dev_desc); 152 void print_part_mac (block_dev_desc_t *dev_desc);
152 int test_part_mac (block_dev_desc_t *dev_desc); 153 int test_part_mac (block_dev_desc_t *dev_desc);
153 #endif 154 #endif
154 155
155 #ifdef CONFIG_DOS_PARTITION 156 #ifdef CONFIG_DOS_PARTITION
156 /* disk/part_dos.c */ 157 /* disk/part_dos.c */
157 int get_partition_info_dos (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); 158 int get_partition_info_dos (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
158 void print_part_dos (block_dev_desc_t *dev_desc); 159 void print_part_dos (block_dev_desc_t *dev_desc);
159 int test_part_dos (block_dev_desc_t *dev_desc); 160 int test_part_dos (block_dev_desc_t *dev_desc);
160 #endif 161 #endif
161 162
162 #ifdef CONFIG_ISO_PARTITION 163 #ifdef CONFIG_ISO_PARTITION
163 /* disk/part_iso.c */ 164 /* disk/part_iso.c */
164 int get_partition_info_iso (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); 165 int get_partition_info_iso (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
165 void print_part_iso (block_dev_desc_t *dev_desc); 166 void print_part_iso (block_dev_desc_t *dev_desc);
166 int test_part_iso (block_dev_desc_t *dev_desc); 167 int test_part_iso (block_dev_desc_t *dev_desc);
167 #endif 168 #endif
168 169
169 #ifdef CONFIG_AMIGA_PARTITION 170 #ifdef CONFIG_AMIGA_PARTITION
170 /* disk/part_amiga.c */ 171 /* disk/part_amiga.c */
171 int get_partition_info_amiga (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); 172 int get_partition_info_amiga (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
172 void print_part_amiga (block_dev_desc_t *dev_desc); 173 void print_part_amiga (block_dev_desc_t *dev_desc);
173 int test_part_amiga (block_dev_desc_t *dev_desc); 174 int test_part_amiga (block_dev_desc_t *dev_desc);
174 #endif 175 #endif
175 176
176 #ifdef CONFIG_EFI_PARTITION 177 #ifdef CONFIG_EFI_PARTITION
177 #include <part_efi.h> 178 #include <part_efi.h>
178 /* disk/part_efi.c */ 179 /* disk/part_efi.c */
179 int get_partition_info_efi (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); 180 int get_partition_info_efi (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
180 void print_part_efi (block_dev_desc_t *dev_desc); 181 void print_part_efi (block_dev_desc_t *dev_desc);
181 int test_part_efi (block_dev_desc_t *dev_desc); 182 int test_part_efi (block_dev_desc_t *dev_desc);
182 183
183 /** 184 /**
184 * write_gpt_table() - Write the GUID Partition Table to disk 185 * write_gpt_table() - Write the GUID Partition Table to disk
185 * 186 *
186 * @param dev_desc - block device descriptor 187 * @param dev_desc - block device descriptor
187 * @param gpt_h - pointer to GPT header representation 188 * @param gpt_h - pointer to GPT header representation
188 * @param gpt_e - pointer to GPT partition table entries 189 * @param gpt_e - pointer to GPT partition table entries
189 * 190 *
190 * @return - zero on success, otherwise error 191 * @return - zero on success, otherwise error
191 */ 192 */
192 int write_gpt_table(block_dev_desc_t *dev_desc, 193 int write_gpt_table(block_dev_desc_t *dev_desc,
193 gpt_header *gpt_h, gpt_entry *gpt_e); 194 gpt_header *gpt_h, gpt_entry *gpt_e);
194 195
195 /** 196 /**
196 * gpt_fill_pte(): Fill the GPT partition table entry 197 * gpt_fill_pte(): Fill the GPT partition table entry
197 * 198 *
198 * @param gpt_h - GPT header representation 199 * @param gpt_h - GPT header representation
199 * @param gpt_e - GPT partition table entries 200 * @param gpt_e - GPT partition table entries
200 * @param partitions - list of partitions 201 * @param partitions - list of partitions
201 * @param parts - number of partitions 202 * @param parts - number of partitions
202 * 203 *
203 * @return zero on success 204 * @return zero on success
204 */ 205 */
205 int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, 206 int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
206 disk_partition_t *partitions, int parts); 207 disk_partition_t *partitions, int parts);
207 208
208 /** 209 /**
209 * gpt_fill_header(): Fill the GPT header 210 * gpt_fill_header(): Fill the GPT header
210 * 211 *
211 * @param dev_desc - block device descriptor 212 * @param dev_desc - block device descriptor
212 * @param gpt_h - GPT header representation 213 * @param gpt_h - GPT header representation
213 * @param str_guid - disk guid string representation 214 * @param str_guid - disk guid string representation
214 * @param parts_count - number of partitions 215 * @param parts_count - number of partitions
215 * 216 *
216 * @return - error on str_guid conversion error 217 * @return - error on str_guid conversion error
217 */ 218 */
218 int gpt_fill_header(block_dev_desc_t *dev_desc, gpt_header *gpt_h, 219 int gpt_fill_header(block_dev_desc_t *dev_desc, gpt_header *gpt_h,
219 char *str_guid, int parts_count); 220 char *str_guid, int parts_count);
220 221
221 /** 222 /**
222 * gpt_restore(): Restore GPT partition table 223 * gpt_restore(): Restore GPT partition table
223 * 224 *
224 * @param dev_desc - block device descriptor 225 * @param dev_desc - block device descriptor
225 * @param str_disk_guid - disk GUID 226 * @param str_disk_guid - disk GUID
226 * @param partitions - list of partitions 227 * @param partitions - list of partitions
227 * @param parts - number of partitions 228 * @param parts - number of partitions
228 * 229 *
229 * @return zero on success 230 * @return zero on success
230 */ 231 */
231 int gpt_restore(block_dev_desc_t *dev_desc, char *str_disk_guid, 232 int gpt_restore(block_dev_desc_t *dev_desc, char *str_disk_guid,
232 disk_partition_t *partitions, const int parts_count); 233 disk_partition_t *partitions, const int parts_count);
233 #endif 234 #endif
234 235
235 #endif /* _PART_H */ 236 #endif /* _PART_H */
236 237