- 论坛徽章:
- 0
|
[patch 2/2] customized machineID in boot command
在confreset命令中，添加了reset machineID的功能。
signed-off-by TanChangxian: <ChangXian.Tan@gmail.com>
signed-off-by ChengYuanQuan: <YuanQuan.Cheng@gmail.com>
signed-off-by VoidJackJiang: <VoidJack.Jiang@gmail.com>
－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－－
Index: app/boot/boot_linux.c
===================================================================
--- app/boot/boot_linux.c (revision 421)
+++ app/boot/boot_linux.c (working copy)
@@ -111,6 +111,7 @@
"\t-f [<part_num>]: root=/dev/mtdblock<part_num>\n"
"\t-n [nfs_server:/path/to/nfs/root]: boot vis NFS\n"
"\t-r [ramdisk_image_name]: boot with Ramdisk\n"
+ "\t-i [machine_ID]: set the machine's ID\n"
"\t-v: print the linux parameters and quit\n"
"\nExamples:\n"
"\t..."
@@ -397,6 +398,8 @@
{
int i;
struct Atag *pTag = pTagBase;
+ struct LinuxParam *pKeParam;
+ GuSysGetLinuxParam(&pKeParam);
if (pTag->stHdr.ulTag != ATAG_CORE)
@@ -408,6 +411,8 @@
i = 0;
printf("\n");
+ printf(" ***Machine ID is %d ***\n", pKeParam->nMachineID);
+
while (1)
{
printf("[ATAG %d] ", ++i);
@@ -577,6 +582,22 @@
BootUsage();
return 0;
+ case 'i':
+ if (i + 1 == argc || '-' == argv[i + 1][0])
+ {
+ pKeParam->nMachineID = CONF_MACHINE_ID;
+
+ break;
+ }
+
+ if (GuStrToVal(argv[++i], &(pKeParam->nMachineID)) < 0)
+ {
+ printf("Invalid option: %s", argv);
+ return -EINVAL;
+ }
+
+ break;
+
default:
printf("Invalid option: \"%s\"!\n", pArg);
BootUsage();
@@ -653,7 +674,7 @@
IrqDisable(); // fixme
- pfExecKernel(0, 6666, ATAG_BASE);
+ pfExecKernel(0, pKeParam->nMachineID, ATAG_BASE);
L1:
printf("Fail to boot linux!\n");
Index: app/flash/sysconf.c
===================================================================
--- app/flash/sysconf.c (revision 421)
+++ app/flash/sysconf.c (working copy)
@@ -230,6 +230,8 @@
strncpy(pKeParam->szConDev, CONF_CONSOLE_NAME, CON_DEV_NAME_LEN);
+ pKeParam->nMachineID = CONF_MACHINE_ID;
+
SysConfCheckSum(NULL);
if (NULL != ppSysConf)
Index: include/sysconf.h
===================================================================
--- include/sysconf.h (revision 421)
+++ include/sysconf.h (working copy)
@@ -39,6 +39,8 @@
char szNfsPath[NFS_PATH_LEN];
char szConDev[CON_DEV_NAME_LEN + 1];
+
+ int nMachineID;
}
[ 本帖最后由 voidjackjiang 于 2009-6-29 10:38 编辑 ] |
|
免费注册
发表于 2009-06-26 16:51
