mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
tool: Move ALIGN_MASK to header as common MACRO
The ALIGN code is need by many files who need handle structure or image align, so move the macro to imagetool.h file. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
9b544c9eb3
commit
c738adb8db
5 changed files with 5 additions and 9 deletions
|
@ -11,7 +11,6 @@
|
||||||
#include <image.h>
|
#include <image.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include "imagetool.h"
|
#include "imagetool.h"
|
||||||
#include "linux/kernel.h"
|
|
||||||
|
|
||||||
#define __packed __attribute__((packed))
|
#define __packed __attribute__((packed))
|
||||||
|
|
||||||
|
|
|
@ -8,15 +8,13 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
|
#include "imagetool.h"
|
||||||
#include "os_support.h"
|
#include "os_support.h"
|
||||||
|
|
||||||
#ifndef __packed
|
#ifndef __packed
|
||||||
#define __packed __attribute__((packed))
|
#define __packed __attribute__((packed))
|
||||||
#endif
|
#endif
|
||||||
#define KiB 1024
|
#define KiB 1024
|
||||||
#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a) - 1)
|
|
||||||
#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask))
|
|
||||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* min()/max()/clamp() macros that also do
|
* min()/max()/clamp() macros that also do
|
||||||
|
|
|
@ -25,6 +25,9 @@
|
||||||
|
|
||||||
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
||||||
|
|
||||||
|
#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask))
|
||||||
|
#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a) - 1)
|
||||||
|
|
||||||
#define IH_ARCH_DEFAULT IH_ARCH_INVALID
|
#define IH_ARCH_DEFAULT IH_ARCH_INVALID
|
||||||
|
|
||||||
/* Information about a file that needs to be placed into the FIT */
|
/* Information about a file that needs to be placed into the FIT */
|
||||||
|
|
|
@ -32,8 +32,6 @@ static uint32_t rom_version = ROM_V1;
|
||||||
|
|
||||||
#define HDMI_FW_SIZE 0x17000 /* Use Last 0x1000 for IVT and CSF */
|
#define HDMI_FW_SIZE 0x17000 /* Use Last 0x1000 for IVT and CSF */
|
||||||
#define ALIGN_SIZE 0x1000
|
#define ALIGN_SIZE 0x1000
|
||||||
#define ALIGN(x,a) __ALIGN_MASK((x), (__typeof__(x))(a) - 1, a)
|
|
||||||
#define __ALIGN_MASK(x,mask,mask2) (((x) + (mask)) / (mask2) * (mask2))
|
|
||||||
|
|
||||||
static uint32_t get_cfg_value(char *token, char *name, int linenr)
|
static uint32_t get_cfg_value(char *token, char *name, int linenr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include "imagetool.h"
|
||||||
#include "../arch/arm/include/asm/arch-sunxi/spl.h"
|
#include "../arch/arm/include/asm/arch-sunxi/spl.h"
|
||||||
|
|
||||||
#define STAMP_VALUE 0x5F0A6C39
|
#define STAMP_VALUE 0x5F0A6C39
|
||||||
|
@ -44,9 +45,6 @@ int gen_check_sum(struct boot_file_head *head_p)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ALIGN(x, a) __ALIGN_MASK((x), (typeof(x))(a)-1)
|
|
||||||
#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
|
|
||||||
|
|
||||||
#define SUNXI_SRAM_SIZE 0x8000 /* SoC with smaller size are limited before */
|
#define SUNXI_SRAM_SIZE 0x8000 /* SoC with smaller size are limited before */
|
||||||
#define SRAM_LOAD_MAX_SIZE (SUNXI_SRAM_SIZE - sizeof(struct boot_file_head))
|
#define SRAM_LOAD_MAX_SIZE (SUNXI_SRAM_SIZE - sizeof(struct boot_file_head))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue