Merge branch '2020-06-03-misc-bugfixes'

[oweals/u-boot.git] / tools / mxsboot.c

diff --git a/tools/mxsboot.c b/tools/mxsboot.c
index 3434c81792cbcb4827849c87a2f83acd22e8330d..04d86f87a86e5050d2e66de92dedd49af1f1ee02 100644 (file)
--- a/tools/mxsboot.c
+++ b/tools/mxsboot.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Freescale i.MX28 image generator
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <endian.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -557,15 +555,15 @@ static int mx28_create_sd_image(int infd, int outfd)
 
        cb = (struct mx28_sd_config_block *)buf;
 
-       cb->signature = htole32(0x00112233);
-       cb->primary_boot_tag = htole32(0x1);
-       cb->secondary_boot_tag = htole32(0x1);
-       cb->num_copies = htole32(1);
-       cb->drv_info[0].chip_num = htole32(0x0);
-       cb->drv_info[0].drive_type = htole32(0x0);
-       cb->drv_info[0].tag = htole32(0x1);
-       cb->drv_info[0].first_sector_number = htole32(sd_sector + 4);
-       cb->drv_info[0].sector_count = htole32((size - 4) / 512);
+       cb->signature = cpu_to_le32(0x00112233);
+       cb->primary_boot_tag = cpu_to_le32(0x1);
+       cb->secondary_boot_tag = cpu_to_le32(0x1);
+       cb->num_copies = cpu_to_le32(1);
+       cb->drv_info[0].chip_num = cpu_to_le32(0x0);
+       cb->drv_info[0].drive_type = cpu_to_le32(0x0);
+       cb->drv_info[0].tag = cpu_to_le32(0x1);
+       cb->drv_info[0].first_sector_number = cpu_to_le32(sd_sector + 4);
+       cb->drv_info[0].sector_count = cpu_to_le32((size - 4) / 512);
 
        wr_size = write(outfd, buf, size);
        if (wr_size != size) {