Merge pull request #130 from tianjiaoling/develop

to fix bug 0000478 in bugtracker

doc/Caliper_Manual.4All.md

@@ -58,7 +58,7 @@ Note: Current building for x86_32 platform is not supported now. For cross compi
 
 <h2 id="2">Download and Install</h2>
 
-`git clone http://github.com/HTSAT/caliper.git`
+`git clone https://github.com/open-estuary/caliper.git`
 
 This will download a directory named caliper in your current operation directory.
 

doc/Deploy_Manual.4D02.md

@@ -302,7 +302,8 @@ For SAS and USB, the UEFI will directly get the grub from the EFI system partiti
         sda2: Ubuntu distribution
         sda3: Fedora distribution
     ```     
-
+   NOTE: The grubaa64.efi file must be put in /EFI/GRUB2 directory of dev/sda1(gpt partition), the distributions could be uncompressed in dev/sdaX(X can be 2,3,4,etc. exclude 1).
+
    （SATA）Related files are placed as follow:
     ```
  
@@ -426,23 +427,34 @@ For SAS and USB, the UEFI will directly get the grub from the EFI system partiti
 
 <h3 id="3.6">Boot via ACPI</h3>
 
-D02 also supports booting via ACPI, you can bring up this systerm which is similar with DTS mode, you must fix some point as follow:
+D02 also supports booting via ACPI, you can bring up this system which is similar with DTS mode, you must fix some point as follow:
 
-1. Delete DTB file and don't burn DTB file
+* Delete DTB file(comment out devicetree /<user>/hip05-d02.dtb as follow) and don't burn DTB file
 
-2. Set the parameters of booting via ACPI
+  e.g.:
 
-you must add `"acpi=force"` property in `"linux=...."` line for "grub.cfg" file.
+  ```shell
+ menuentry "D02 Ubuntu NFS" --id d02_ubuntu_nfs {
+        set root=(tftp,192.168.1.107)
+        linux /Image rdinit=/init pcie_aspm=off console=ttyS0,115200 earlycon=uart8250,mmio32,0x80300000 root=/dev/nfs rw nfsroot=192.168.1.107:/home/ftp/user/rootfs_ubuntu64 ip=dhcp
+         # devicetree /<user>/hip05-d02.dtb
+   }
+
+  ```
 
-e.g.:
+* Set the parameters of booting via ACPI
 
-```shell
+  you must add `"acpi=force"` property in `"linux"` line for "grub.cfg" file. If not, system will booted up with DTS by default.
+
+  e.g.:
+
+  ```shell
 # Booting from NFS with Ubuntu rootfs
-menuentry "D02 Ubuntu NFS(ACPI)" --id d02_ubuntu_nfs {
+menuentry "D02 Ubuntu NFS(ACPI)" --id d02_ubuntu_nfs_acpi {
     set root=(tftp,192.168.1.107)
     linux /Image rdinit=/init pcie_aspm=off console=ttyS0,115200 earlycon=uart8250,mmio32,0x80300000 root=/dev/nfs rw nfsroot=192.168.1.107:/home/ftp/user/rootfs_ubuntu64 ip=dhcp acpi=force
-}
+  }
 
-```
+  ```
 
 NOTE: you can get more information about setting grub.cfg from [Grub_Manual.md](https://github.com/open-estuary/estuary/blob/master/doc/Grub_Manual.4All.md).

doc/Deploy_Manual.4D03.md

@@ -239,7 +239,9 @@ D03 board supports booting via SAS, USB and SATA by default. The UEFI will direc
               |-------------Image          //kernel binary Image
         sda2: Ubuntu distribution
         sda3: Fedora distribution
-   ```     
+   ```
+   NOTE: The grubaa64.efi file must be put in /EFI/GRUB2 directory of dev/sda1(gpt partition), the distributions could be uncompressed in dev/sdaX(X can be 2,3,4,etc. exclude 1).  
+
     To get kernel image and dtb file, please refer to [Readme.md](https://github.com/open-estuary/estuary/blob/master/doc/Readme.4D03.md).<br>
     To get and config grub and grub.cfg, please refer to [Grub_Manual.md](https://github.com/open-estuary/estuary/blob/master/doc/Grub_Manual.4All.md).<br>
     To get different distributions, please refer to [Distributions_Guider](https://github.com/open-estuary/estuary/blob/master/doc/Distributions_Guide.4All.md).<br> 
@@ -301,21 +303,29 @@ D03 board supports booting via SAS, USB and SATA by default. The UEFI will direc
 
 <h3 id="3.5">Boot via ACPI</h3>
 
-D03 also supports booting via ACPI, you can bring up this systerm which is similar with DTS mode, you must fix some point as follow:
+D03 also supports booting via ACPI, you can bring up this system which is similar with DTS mode, you must fix some point as follow:
 
-1. Delete DTB file and don't burn DTB file
+1. Delete DTB file(comment out devicetree /<user>/hip06-d03.dtb as follow) and don't burn DTB file
+
+   ``` 
+    menuentry "D03 Ubuntu NFS" --id d03_ubuntu_nfs {
+    set root=(tftp,192.168.1.107)
+    linux /Image rdinit=/init pcie_aspm=off console=ttyS0,115200 earlycon=hisilpcuart,mmio,0xa01b0000,0,0x2f8 root=/dev/nfs rw nfsroot=192.168.1.107:/home/ftp/user/rootfs_ubuntu64 ip=dhcp
+    #devicetree /<user>/hip06-d03.dtb
+    }
 
+   ```
+
 2. Set the parameters of booting via ACPI
 
-you must add `"acpi=force"` property in `"linux=...."` line for "grub.cfg" file.
+you must add `"acpi=force"` property in `"linux"` line for "grub.cfg" file. If not, system will booted up with DTS by default.
 
 e.g.:
 ```shell
 # Booting from NFS with Ubuntu rootfs
-menuentry "D03 Ubuntu NFS(ACPI)" --id d03_ubuntu_nfs {
+menuentry "D03 Ubuntu NFS(ACPI)" --id d03_ubuntu_nfs_acpi {
     set root=(tftp,192.168.1.107)
     linux /Image rdinit=/init pcie_aspm=off console=ttyS0,115200 earlycon=hisilpcuart,mmio,0xa01b0000,0,0x2f8 root=/dev/nfs rw nfsroot=192.168.1.107:/home/ftp/user/rootfs_ubuntu64 ip=dhcp acpi=force
 }
 ```
-
 NOTE: you can get more information about setting grub.cfg from [Grub_Manual.md](https://github.com/open-estuary/estuary/blob/master/doc/Grub_Manual.4All.md).

doc/Grub_Manual.4All.md

@@ -188,7 +188,7 @@ Normally they are placed into bootable partition as following structure.
 ```
 Note: In case of booting by PXE mode:
 
-   1. The gurb binary and grub.cfg files must be placed in the TFTP root directory.
+   1. The grub binary and grub.cfg files must be placed in the TFTP root directory.
 
    2. The names and positions of kernel image and dtb must be consistent with the corresponding grub config file.
 

doc/Readme.4D02.md

@@ -1,6 +1,6 @@
 This is the readme file for D02 platform
 
-After you executed `./estuary/build.sh --cfgfile=./estuary/estuarycfg.json --builddir=./workspace` for D02, all targets files will be produced. they are:
+After you executed `./estuary/build.sh --file=./estuary/estuarycfg.json --builddir=./workspace` for D02, all targets files will be produced. they are:
 
 ### UEFI_D02.fd 
 

doc/Readme.4D03.md

@@ -1,6 +1,6 @@
 This is the readme file for D03 platform
 
-After you executed `./estuary/build.sh --cfgfile=./estuary/estuarycfg.json --builddir=./workspace` for D03, all targets files will be produced. they are:
+After you executed `./estuary/build.sh --file=./estuary/estuarycfg.json --builddir=./workspace` for D03, all targets files will be produced. they are:
 
 ### UEFI_D03.fd 
 

doc/Readme.4HiKey.md

@@ -5,7 +5,7 @@ sudo apt-get install -y wget automake1.11 make bc libncurses5-dev libtool li
 bc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 bison flex uuid-dev build-esse
 ntial iasl gcc zlib1g-dev libperl-dev libgtk2.0-dev libfdt-dev
 
-After you executed `./estuary/build.sh --cfgfile=./estuary/estuarycfg.json --builddir=./workspace` for HiKey, all targets files will be produced. they are:
+After you executed `./estuary/build.sh --file=./estuary/estuarycfg.json --builddir=./workspace` for HiKey, all targets files will be produced. they are:
 
 ### l-loader.bin
 ### ptable-linux.img 

doc/Setup_PXE_Env_on_Host.4All.md

@@ -110,7 +110,7 @@ Note:
 
    1. The name of grub binary "grubaa64.efi" or "grubarm32.efi" must be as same as the DHCP configure file in `/etc/dhcp/dhcpd.conf`.<br>
    2. The grub configure file’s name must comply with a special format, e.g. grub.cfg-01-xx-xx-xx-xx-xx-xx, it starts with "grub.cfg-01-" and ends with board’s MAC address.<br>
-   3. The gurb binary and grub.cfg-01-xx-xx-xx-xx-xx-xx files must be placed in the TFTP root directory.<br>
+   3. The grub binary and grub.cfg-01-xx-xx-xx-xx-xx-xx files must be placed in the TFTP root directory.<br>
    4. The names and positions of kernel image and dtb must be consistent with the corresponding grub config file.<br>
 
 To get and config grub and grub config files, please refer to [Grub_Manual.md](https://github.com/open-estuary/estuary/blob/master/doc/Grub_Manual.4All.md).