Looks like this was duplicated in a rebase/merge. I’ll fix this up to use constants instead of the #defines and apply.

Thanks!

On 27 Jul 2017, at 13:59, Kever Yang kever.yang@rock-chips.com wrote:

Some code are duplicate, remove one of them

Signed-off-by: Kever Yang kever.yang@rock-chips.com

board/theobroma-systems/puma_rk3399/puma-rk3399.c | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 36e9cd7..5375247 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -9,22 +9,16 @@ #include <ram.h> #include <dm/pinctrl.h> #include <dm/uclass-internal.h> -#include <misc.h> #include <asm/setup.h> #include <asm/arch/periph.h> #include <power/regulator.h> #include <u-boot/sha256.h>

-#define RK3399_CPUID_OFF 0x7 -#define RK3399_CPUID_LEN 0x10

DECLARE_GLOBAL_DATA_PTR;

#define RK3399_CPUID_OFF 0x7 #define RK3399_CPUID_LEN 0x10

-DECLARE_GLOBAL_DATA_PTR;

int board_init(void) { struct udevice *pinctrl, *regulator; -- 1.9.1