Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master
This commit is contained in:
commit
90a3af45a0
2
Makefile
2
Makefile
|
@ -1961,7 +1961,7 @@ TQM8560_config: unconfig
|
||||||
echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
|
echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
|
||||||
echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
|
echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
|
||||||
echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
|
echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
|
||||||
echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>$(obj)include/config.h
|
echo "#define CFG_BOOTFILE_PATH \"/tftpboot/tqm$${CTYPE}/uImage\"">>$(obj)include/config.h
|
||||||
@$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
|
@$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
|
@ -449,7 +449,7 @@
|
||||||
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
|
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
CFG_BOOTFILE \
|
"bootfile="CFG_BOOTFILE_PATH"\0" \
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"consdev=ttyS0\0" \
|
"consdev=ttyS0\0" \
|
||||||
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
||||||
|
|
Loading…
Reference in a new issue