Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7dfb172d67f8c665be7377b5507e43304166cad0

Authored by Simon Glass
1 parent 673ed2f8c2
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

x86: ifdtool: Separate out filenames for -D and -i 

To allow these options to be specified together, separate them out.

Change-Id: Ib93f11cd51eb3302127f4c82936ff2b44c88d5a2
Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

... ... @@ -779,8 +779,8 @@
779 779 int mode_spifreq = 0, mode_em100 = 0, mode_locked = 0;
780 780 int mode_unlocked = 0, mode_write = 0, mode_write_descriptor = 0;
781 781 int create = 0;
782   - char *region_type_string = NULL, *src_fname = NULL;
783   - char *addr_str = NULL;
  782 + char *region_type_string = NULL, *inject_fname = NULL;
  783 + char *desc_fname = NULL, *addr_str = NULL;
784 784 int region_type = -1, inputfreq = 0;
785 785 enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ;
786 786 unsigned int addr[WRITE_MAX];
787 787  
... ... @@ -823,14 +823,14 @@
823 823 break;
824 824 case 'D':
825 825 mode_write_descriptor = 1;
826   - src_fname = optarg;
  826 + desc_fname = optarg;
827 827 break;
828 828 case 'e':
829 829 mode_em100 = 1;
830 830 break;
831 831 case 'i':
832 832 if (get_two_words(optarg, &region_type_string,
833   - &src_fname)) {
  833 + &inject_fname)) {
834 834 print_usage(argv[0]);
835 835 exit(EXIT_FAILURE);
836 836 }
837 837  
... ... @@ -1008,10 +1008,10 @@
1008 1008 }
1009 1009  
1010 1010 if (mode_write_descriptor)
1011   - ret = write_data(image, size, -size, src_fname);
  1011 + ret = write_data(image, size, -size, desc_fname);
1012 1012  
1013 1013 if (mode_inject)
1014   - ret = inject_region(image, size, region_type, src_fname);
  1014 + ret = inject_region(image, size, region_type, inject_fname);
1015 1015  
1016 1016 if (mode_write) {
1017 1017 for (wr_idx = 0; wr_idx < wr_num; wr_idx++) {