configs: rpi: set NR_DRAM_BANKS to four

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

diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
index a33c15e1f018dfdd85ecac4ee9ef233bda09bbf8..82ce0ac1a5200b17ad8c21fbe64ac5816b62b950 100644 (file)
--- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c
@@ -425,8 +425,8 @@ static int bif_add_part(struct bif_entry *bf, const char *data, size_t len)
                if (!bif_output.header->image_offset)
                        bif_output.header->image_offset =
                                cpu_to_le32(bf->offset);
-               bif_output.header->image_size = cpu_to_le32(len);
-               bif_output.header->image_stored_size = cpu_to_le32(len);
+               bif_output.header->image_size = cpu_to_le32(len_padded);
+               bif_output.header->image_stored_size = cpu_to_le32(len_padded);
 
                bif_output.header->image_attributes &= ~HEADER_CPU_SELECT_MASK;
                switch (bf->dest_cpu) {
@@ -517,7 +517,7 @@ static int bif_add_bit(struct bif_entry *bf)
        debug("Bitstream Length: 0x%x\n", bitlen);
        for (i = 0; i < bitlen; i += sizeof(uint32_t)) {
                uint32_t *bitbin32 = (uint32_t *)&bitbin[i];
-               *bitbin32 = __swab32(*bitbin32);
+               *bitbin32 = __builtin_bswap32(*bitbin32);
        }
 
        if (!bf->dest_dev)