Hi I am working on porting a pretty old uboot (2010.09) to a slightly less old uboot (2013.04)

Once I resolved all the merge conflicts, I can't build any mpc83xx boards (e.g. MPC8360EMDS_33).

I keep getting this error:

make[2]: Entering directory `/usr/local/src/uboot/common' gcc -g -Os -fpic -mrelocatable -ffunction-sections -fdata-sections -meabi -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0xFE000000 -I/usr/local/src/uboot/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/powerpc-linux-gnu/4.4.5/include -pipe -DCONFIG_PPC -D__powerpc__ -DCONFIG_MPC83xx -DCONFIG_E300 -ffixed-r2 -msoft-float -Wall -Wstrict-prototypes -fno-stack-protector -Wno-format-nonliteral -Wno-format-security -o cmd_bdinfo.o cmd_bdinfo.c -c gcc -g -Os -fpic -mrelocatable -ffunction-sections -fdata-sections -meabi -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0xFE000000 -I/usr/local/src/uboot/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/powerpc-linux-gnu/4.4.5/include -pipe -DCONFIG_PPC -D__powerpc__ -DCONFIG_MPC83xx -DCONFIG_E300 -ffixed-r2 -msoft-float -Wall -Wstrict-prototypes -fno-stack-protector -Wno-format-nonliteral -Wno-format-security -o cmd_boot.o cmd_boot.c -c gcc -g -Os -fpic -mrelocatable -ffunction-sections -fdata-sections -meabi -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0xFE000000 -I/usr/local/src/uboot/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/powerpc-linux-gnu/4.4.5/include -pipe -DCONFIG_PPC -D__powerpc__ -DCONFIG_MPC83xx -DCONFIG_E300 -ffixed-r2 -msoft-float -Wall -Wstrict-prototypes -fno-stack-protector -Wno-format-nonliteral -Wno-format-security -o cmd_bootm.o cmd_bootm.c -c cmd_bootm.c:46:32: error: asm/arch/sys_proto.h: No such file or directory

I know the file is auto generated, so its likely I'm missing something in the Makefile. Can someone help point me at the patch/adaptation I might be missing?

I don't see the broken-ness on uboot master.

Thanks.

-- Richard Retanubun