From fd0ef895b685af350a6dabf9688522a3a8a1b810 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 25 Sep 2019 08:57:22 -0600 Subject: x86: Drop RESET_BASE Since x86 users binman now, we don't need this compile-time define. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Tested-by: Bin Meng --- arch/x86/cpu/config.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/x86/cpu') diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index 22416f39b6..e5a393a1c8 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -10,7 +10,6 @@ LDPPFLAGS += -DRESET_SEG_START=$(CONFIG_RESET_SEG_START) LDPPFLAGS += -DRESET_SEG_SIZE=$(CONFIG_RESET_SEG_SIZE) LDPPFLAGS += -DRESET_VEC_LOC=$(CONFIG_RESET_VEC_LOC) LDPPFLAGS += -DSTART_16=$(CONFIG_SYS_X86_START16) -LDPPFLAGS += -DRESET_BASE="CONFIG_SYS_TEXT_BASE + (CONFIG_SYS_MONITOR_LEN - RESET_SEG_SIZE)" ifdef CONFIG_X86_64 ifndef CONFIG_SPL_BUILD -- cgit From b9e7c3370e264cce7b09ba7fd7957f947a40c837 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 25 Sep 2019 08:57:23 -0600 Subject: x86: Drop RESET_SEG_SIZE This is not used anywhere now, so drop it. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Tested-by: Bin Meng --- arch/x86/cpu/config.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/x86/cpu') diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index e5a393a1c8..8f9814c0ae 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -7,7 +7,6 @@ CROSS_COMPILE ?= i386-linux- # DO NOT MODIFY THE FOLLOWING UNLESS YOU REALLY KNOW WHAT YOU ARE DOING! LDPPFLAGS += -DRESET_SEG_START=$(CONFIG_RESET_SEG_START) -LDPPFLAGS += -DRESET_SEG_SIZE=$(CONFIG_RESET_SEG_SIZE) LDPPFLAGS += -DRESET_VEC_LOC=$(CONFIG_RESET_VEC_LOC) LDPPFLAGS += -DSTART_16=$(CONFIG_SYS_X86_START16) -- cgit From d362a088175778097f5405074cd1445bc64ae201 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 25 Sep 2019 09:00:31 -0600 Subject: x86: Reduce resetvec size At present this produces a 16-byte file. It is intended to start 16 bytes before the end of ROM and pads with zeroes to readh the end. But binman sometimes wants to add an image-header at the very end of ROM. Furthermore binman automatically pads the data if it is finishes early. Drop the padding in resetvec and let binman handle it. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Tested-by: Bin Meng --- arch/x86/cpu/resetvec.S | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/x86/cpu') diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index a52225d5ee..cf972738b3 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -16,6 +16,3 @@ reset_vector: cli cld jmp start16 - - .org 0xf - nop -- cgit